Skip to content

Commit

Permalink
[Janitor mode] Fix whitespace
Browse files Browse the repository at this point in the history 
git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@21475 f25d12d1-65f4-0310-ae8a-bbce733d8d8e
  • Loading branch information
@OpenModelica-Hudson
OpenModelica-Hudson committed Jul 11, 2014
1 parent 2dbb273 commit e804418
Show file tree
Hide file tree
Showing 8 changed files with 34 additions and 34 deletions.
32 changes: 16 additions & 16 deletions Compiler/BackEnd/BackendDAEOptimize.mo
View file
Expand Up @@ -124,7 +124,7 @@ algorithm
BackendDAE.Shared shared;
BackendDAE.StateSets stateSets;
BackendDAE.BaseClockPartitionKind partitionKind;

case (BackendDAE.EQSYSTEM(orderedVars,orderedEqs,m,mT,matching,stateSets,partitionKind),(shared as BackendDAE.SHARED(knownVars = knvars,aliasVars = aliasvars), _))
equation
((_,_,true)) = BackendDAEUtil.traverseBackendDAEExpsEqnsWithUpdate(orderedEqs,traversersimplifyTimeIndepFuncCalls,(knvars,aliasvars,false));
Expand Down Expand Up @@ -717,7 +717,7 @@ algorithm
BackendDAE.Matching matching;
BackendDAE.StateSets stateSets;
BackendDAE.BaseClockPartitionKind partitionKind;

case (BackendDAE.EQSYSTEM(vars,eqns,_,_,matching,stateSets,partitionKind),_)
equation
lsteqns = BackendEquation.equationList(eqns);
Expand Down Expand Up @@ -911,7 +911,7 @@ algorithm
Boolean b;
BackendDAE.StateSets stateSets;
BackendDAE.BaseClockPartitionKind partitionKind;

case (BackendDAE.EQSYSTEM(orderedVars=vars,orderedEqs=eqns,stateSets=stateSets,partitionKind=partitionKind),_)
equation
lsteqns = BackendEquation.equationList(eqns);
Expand Down Expand Up @@ -1713,7 +1713,7 @@ algorithm
BackendDAE.EquationArray eqns;
BackendDAE.StateSets stateSets;
BackendDAE.BaseClockPartitionKind partitionKind;

case (false,_) then isyst;
// case (true,BackendDAE.EQSYSTEM(orderedVars=vars,orderedEqs=eqns,matching=BackendDAE.NO_MATCHING()))
case (true,BackendDAE.EQSYSTEM(orderedVars=vars,orderedEqs=eqns,stateSets=stateSets,partitionKind=partitionKind))
Expand Down Expand Up @@ -1804,7 +1804,7 @@ algorithm
BackendDAE.Shared shared;
BackendDAE.StateSets stateSets;
BackendDAE.BaseClockPartitionKind partitionKind;

case (BackendDAE.EQSYSTEM(orderedVars=vars,orderedEqs=eqns,matching=matching,stateSets=stateSets,partitionKind=partitionKind),BackendDAE.SHARED(functionTree=funcs),_,_,_,_,_)
equation
eqns1 = BackendEquation.listEquation(eqn_lst);
Expand Down Expand Up @@ -4668,16 +4668,16 @@ algorithm
Integer i1, i2;
String s1, s2;
Boolean b;

case (_, BackendDAE.EQSYSTEM(orderedVars=vars, orderedEqs=arr), _, _, _) equation
ea = arrayCreate(n, {});
va = arrayCreate(n, {});
i1 = BackendDAEUtil.equationSize(arr);
i2 = BackendVariable.numVariables(vars);
s1 = intString(i1);
s2 = intString(i2);
Error.assertionOrAddSourceMessage((i1 == i2) or throwNoError,
Util.if_(i1 > i2, Error.OVERDET_EQN_SYSTEM, Error.UNDERDET_EQN_SYSTEM),
Error.assertionOrAddSourceMessage((i1 == i2) or throwNoError,
Util.if_(i1 > i2, Error.OVERDET_EQN_SYSTEM, Error.UNDERDET_EQN_SYSTEM),
{s1, s2}, Absyn.dummyInfo);

partitionEquations(BackendDAEUtil.equationArraySize(arr), arr, ixs, ea);
Expand Down Expand Up @@ -4732,10 +4732,10 @@ algorithm
Integer ix;
list<BackendDAE.Equation> lst;
BackendDAE.Equation eq;

case (0, _, _, _)
then ();

case (_, _, _, _) equation
ix = ixs[n];
lst = ea[ix];
Expand Down Expand Up @@ -4765,10 +4765,10 @@ algorithm
DAE.ComponentRef cr;
String name;
Absyn.Info info;

case (0, _, _, _, _, _)
then ();

case (_, _, _, _, _, _) equation
v = BackendVariable.getVarAt(vars, n);
cr = BackendVariable.varCref(v);
Expand Down Expand Up @@ -5944,7 +5944,7 @@ algorithm
array<list<tuple<BackendDAE.Equation,Integer>>> eqnsarray;
BackendDAE.StateSets stateSets;
BackendDAE.BaseClockPartitionKind partitionKind;

case (BackendDAE.EQSYSTEM(orderedVars=vars,orderedEqs=eqns,stateSets=stateSets,partitionKind=partitionKind),shared)
equation
// traverse the equations and collect all semiLinear calls y=semiLinear(x,sa,sb)
Expand Down Expand Up @@ -6411,7 +6411,7 @@ algorithm
String s;
BackendDAE.StateSets stateSets;
BackendDAE.BaseClockPartitionKind partitionKind;

case (BackendDAE.EQSYSTEM(orderedVars,orderedEqs,m,mT,matching,stateSets,partitionKind),(shared, _))
equation
((_,explst as _::_)) = BackendDAEUtil.traverseBackendDAEExpsEqnsWithUpdate(orderedEqs,traverserinputDerivativesUsed,(BackendVariable.daeKnVars(shared),{}));
Expand Down Expand Up @@ -6906,7 +6906,7 @@ protected
Integer index;
HashTableExpToIndex.HashTable ht;
BackendDAE.BaseClockPartitionKind partitionKind;

algorithm
BackendDAE.EQSYSTEM(orderedVars=orderedVars, orderedEqs=orderedEqs, stateSets=stateSets, partitionKind=partitionKind) := inEqSystem;
(index, ht) := inTpl;
Expand Down Expand Up @@ -7367,7 +7367,7 @@ algorithm
BackendDAE.StateSets stateSets;
BackendDAE.ExtraInfo ei;
BackendDAE.BaseClockPartitionKind partitionKind;

case (BackendDAE.EQSYSTEM(vars, eqns, m, mT, matching, stateSets, partitionKind), BackendDAE.SHARED(knvars, exobj, av, inieqns, remeqns, constrs, clsAttrs, cache, env, funcs, einfo, eoc, btp, symjacs,ei))
equation
(eqns1, (vars1, _)) = BackendEquation.traverseBackendDAEEqnsWithUpdate(eqns, traverserexpandDerEquation, (vars, shared));
Expand Down
6 changes: 3 additions & 3 deletions Compiler/BackEnd/BackendDAETransform.mo
View file
Expand Up @@ -97,7 +97,7 @@ algorithm
array<Integer> markarray;
BackendDAE.StateSets stateSets;
BackendDAE.BaseClockPartitionKind partitionKind;

case (BackendDAE.EQSYSTEM(vars,eqs,SOME(_),SOME(mt),BackendDAE.MATCHING(ass1=ass1,ass2=ass2),stateSets=stateSets,partitionKind=partitionKind),_,_,_)
equation
comps = tarjanAlgorithm(mt,ass2);
Expand Down Expand Up @@ -299,7 +299,7 @@ algorithm
BackendDAE.Variables vars;
BackendDAE.StateSets stateSets;
BackendDAE.BaseClockPartitionKind partitionKind;

case (BackendDAE.EQSYSTEM(vars,eqs,SOME(m),SOME(mt),BackendDAE.MATCHING(ass1=ass1,ass2=ass2),stateSets=stateSets,partitionKind=partitionKind),_)
equation
comps = tarjanAlgorithm(mt,ass2);
Expand Down Expand Up @@ -364,7 +364,7 @@ algorithm
list<BackendDAE.Equation> eqn_lst;
BackendDAE.EquationArray eqns;
BackendDAE.StrongComponent compX;

case (comp,BackendDAE.EQSYSTEM(orderedVars=vars,orderedEqs=eqns),_,ass1,ass2)
equation
(eqn_lst,var_varindx_lst) = List.map3_2(comp, getEquationAndSolvedVar_Internal, eqns, vars, ass2);
Expand Down
8 changes: 4 additions & 4 deletions Compiler/BackEnd/BackendDAEUtil.mo
View file
Expand Up @@ -521,7 +521,7 @@ algorithm
BackendDAE.Shared shared;
BackendDAE.StateSets stateSets;
BackendDAE.BaseClockPartitionKind partitionKind;

case (BackendDAE.EQSYSTEM(ordvars,eqns,m,mT,matching,stateSets,partitionKind),shared)
equation
// copy varibales
Expand Down Expand Up @@ -785,7 +785,7 @@ algorithm
BackendDAE.Matching matching;
BackendDAE.StateSets stateSets;
BackendDAE.BaseClockPartitionKind partitionKind;

case (BackendDAE.EQSYSTEM(vars, eqs, m, mT, matching, stateSets, partitionKind),_)
equation
vars = BackendVariable.addVars(varlst, vars);
Expand Down Expand Up @@ -4107,7 +4107,7 @@ algorithm
BackendDAE.Matching matching;
BackendDAE.StateSets stateSets;
BackendDAE.BaseClockPartitionKind partitionKind;

case (BackendDAE.EQSYSTEM(vars,daeeqns,SOME(m),SOME(mt),matching,stateSets,partitionKind),_,_,_)
equation
(m,mt) = updateIncidenceMatrix1(vars,daeeqns,inIndxType,functionTree,m,mt,inIntegerLst);
Expand Down Expand Up @@ -4200,7 +4200,7 @@ algorithm
array<Integer> mapIncRowEqn;
BackendDAE.StateSets stateSets;
BackendDAE.BaseClockPartitionKind partitionKind;

case (BackendDAE.EQSYSTEM(vars,daeeqns,SOME(m),SOME(mt),matching,stateSets,partitionKind),_,_,_,_,_)
equation
// extend the mapping arrays
Expand Down
6 changes: 3 additions & 3 deletions Compiler/BackEnd/BackendEquation.mo
View file
Expand Up @@ -1525,7 +1525,7 @@ algorithm
Option<BackendDAE.IncidenceMatrixT> mT;
BackendDAE.StateSets stateSets;
BackendDAE.BaseClockPartitionKind partitionKind;

case (_,BackendDAE.EQSYSTEM(orderedVars=ordvars,orderedEqs=eqns,m=m,mT=mT,stateSets=stateSets,partitionKind=partitionKind))
equation
eqns1 = equationAdd(inEquation,eqns);
Expand All @@ -1547,7 +1547,7 @@ algorithm
Option<BackendDAE.IncidenceMatrixT> mT;
BackendDAE.StateSets stateSets;
BackendDAE.BaseClockPartitionKind partitionKind;

case (_,BackendDAE.EQSYSTEM(orderedVars=ordvars,orderedEqs=eqns,m=m,mT=mT,stateSets=stateSets,partitionKind=partitionKind))
equation
eqns1 = List.fold(inEquations,equationAdd,eqns);
Expand Down Expand Up @@ -1604,7 +1604,7 @@ algorithm
BackendDAE.Matching matching;
BackendDAE.StateSets stateSets;
BackendDAE.BaseClockPartitionKind partitionKind;

case (_, _,BackendDAE.EQSYSTEM(ordvars,eqns,m,mT,matching,stateSets,partitionKind))
equation
eqns1 = equationSetnth(eqns,inInteger,inEquation);
Expand Down
6 changes: 3 additions & 3 deletions Compiler/BackEnd/BackendVariable.mo
View file
Expand Up @@ -2940,7 +2940,7 @@ algorithm
BackendDAE.Matching matching;
BackendDAE.StateSets stateSets;
BackendDAE.BaseClockPartitionKind partitionKind;

case (_,BackendDAE.EQSYSTEM(ordvars,eqns,m,mT,matching,stateSets=stateSets,partitionKind=partitionKind))
equation
(ordvars1,outVar) = removeVar(inVarPos,ordvars);
Expand Down Expand Up @@ -3134,7 +3134,7 @@ algorithm
BackendDAE.Matching matching;
BackendDAE.StateSets stateSets;
BackendDAE.BaseClockPartitionKind partitionKind;

case (_,BackendDAE.EQSYSTEM(ordvars,eqns,m,mT,matching,stateSets,partitionKind))
equation
ordvars1 = addVar(inVar,ordvars);
Expand Down Expand Up @@ -3381,7 +3381,7 @@ algorithm
BackendDAE.Matching matching;
BackendDAE.StateSets stateSets;
BackendDAE.BaseClockPartitionKind partitionKind;

case (_,BackendDAE.EQSYSTEM(ordvars,eqns,m,mT,matching,stateSets,partitionKind))
equation
ordvars1 = expandVars(needed,ordvars);
Expand Down
2 changes: 1 addition & 1 deletion Compiler/BackEnd/IndexReduction.mo
View file
Expand Up @@ -2189,7 +2189,7 @@ algorithm
list<BackendDAE.Equation> eqnslst1;
list<tuple<DAE.ComponentRef, Integer>> states,dstates;
DAE.FunctionTree funcs;

// number of free states equal to number of differentiated equations -> no state selection necessary, all dummy states
case (_,_,_,_,_,_,_,_,_,_,_,_,_)
equation
Expand Down
2 changes: 1 addition & 1 deletion Compiler/BackEnd/Matching.mo
View file
Expand Up @@ -6119,7 +6119,7 @@ algorithm
BackendDAE.EqSystem syst;
BackendDAE.StateSets stateSets;
BackendDAE.BaseClockPartitionKind partitionKind;

case (BackendDAE.EQSYSTEM(orderedVars=vars,orderedEqs=eqns,stateSets=stateSets,partitionKind=partitionKind),_)
equation
ne = BackendDAEUtil.systemSize(isyst);
Expand Down
6 changes: 3 additions & 3 deletions Compiler/BackEnd/RemoveSimpleEquations.mo
View file
Expand Up @@ -328,7 +328,7 @@ algorithm
BackendDAE.EqSystem syst;
BackendDAE.StateSets stateSets;
BackendDAE.BaseClockPartitionKind partitionKind;

case (BackendDAE.EQSYSTEM(orderedVars=vars, orderedEqs=eqns, stateSets=stateSets, partitionKind=partitionKind), (shared, (repl, unReplaceable, b1)))
equation
// transform to list, this is later not neccesary because the acausal system should save the equations as list
Expand Down Expand Up @@ -394,7 +394,7 @@ algorithm
BackendDAE.EqSystem syst;
BackendDAE.StateSets stateSets;
BackendDAE.BaseClockPartitionKind partitionKind;

case (BackendDAE.EQSYSTEM(orderedVars=vars, orderedEqs=eqns, matching=BackendDAE.MATCHING(comps=comps), stateSets=stateSets, partitionKind=partitionKind), (shared, (repl, unReplaceable, b1)))
equation
mT = arrayCreate(BackendVariable.varsSize(vars), {});
Expand Down Expand Up @@ -3491,7 +3491,7 @@ algorithm
BackendDAE.StateSets stateSets;
BackendDAE.BaseClockPartitionKind partitionKind;
Option<BackendVarTransform.VariableReplacements> statesetrepl1;

case ({}, _, _, _, _) then inSysts1;
case ((syst as BackendDAE.EQSYSTEM(orderedVars=v, orderedEqs=eqns, stateSets=stateSets, partitionKind=partitionKind))::rest, _, _, _, _)
equation
Expand Down

0 comments on commit e804418

Please sign in to comment.