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@22058 f25d12d1-65f4-0310-ae8a-bbce733d8d8e
  • Loading branch information
OpenModelica-Hudson committed Aug 31, 2014
1 parent 7a145f4 commit 812fe69
Show file tree
Hide file tree
Showing 4 changed files with 24 additions and 24 deletions.
4 changes: 2 additions & 2 deletions Compiler/BackEnd/BackendDAEOptimize.mo
Expand Up @@ -3190,7 +3190,7 @@ algorithm
inputvars2 = List.select(knvarlst,BackendVariable.isVarOnTopLevelAndInput);
outputvars = List.select(varlst, BackendVariable.isVarOnTopLevelAndOutput);
conVarsList = List.select(varlst, BackendVariable.isRealOptimizeConstraintsVars);

states_inputs = listAppend(states, inputvars2);
_ = List.map(states,BackendVariable.varCref);
_ = List.map(inputvars2,BackendVariable.varCref);
Expand All @@ -3201,7 +3201,7 @@ algorithm
paramvarsarr = BackendVariable.listVar1(paramvars);
outputvarsarr = BackendVariable.listVar1(outputvars);
conVars = BackendVariable.listVar1(conVarsList);

//BackendDump.printVariables(conVars);
//BackendDump.printVariables(object);
//print(intString(BackendVariable.numVariables(object)));
Expand Down
4 changes: 2 additions & 2 deletions Compiler/BackEnd/BackendEquation.mo
Expand Up @@ -2030,8 +2030,8 @@ algorithm
expNull = DAE.RCONST(0.0);
dummyVar = BackendVariable.setVarMinMax(dummyVar, (SOME(expNull), SOME(expNull)));
then ({BackendDAE.SOLVED_EQUATION(lhs, rhs, Source, BackendDAE.EQ_ATTR_DEFAULT_UNKNOWN)}, dummyVar);
case(_,e1 as DAE.CREF(componentRef = cr),_,_,_) equation

case(_,e1 as DAE.CREF(componentRef = cr),_,_,_) equation
mergeVars = BackendVariable.mergeVariables(inVars, knvars);
({v},_)= BackendVariable.getVar(cr,mergeVars);
lhs = ComponentReference.makeCrefIdent("$OMC$constarintTerm" +& intString(inI), DAE.T_REAL_DEFAULT, {});
Expand Down
12 changes: 6 additions & 6 deletions Compiler/BackEnd/BackendVariable.mo
Expand Up @@ -1663,10 +1663,10 @@ public function hasMayerTermAnno
algorithm
outBoolean := match (inVar)
local SCode.Comment comm;

case (BackendDAE.VAR(comment= SOME(comm) ))
then SCode.commentHasBooleanNamedAnnotation(comm, "isMayer");
else then false;
else then false;
end match;
end hasMayerTermAnno;

Expand All @@ -1678,10 +1678,10 @@ public function hasLagrangeTermAnno
algorithm
outBoolean := match (inVar)
local SCode.Comment comm;

case (BackendDAE.VAR(comment= SOME(comm) ))
then SCode.commentHasBooleanNamedAnnotation(comm, "isLagrange");
else then false;
else then false;
end match;
end hasLagrangeTermAnno;

Expand All @@ -1693,10 +1693,10 @@ public function hasConTermAnno
algorithm
outBoolean := match (inVar)
local SCode.Comment comm;

case (BackendDAE.VAR(comment= SOME(comm) ))
then SCode.commentHasBooleanNamedAnnotation(comm, "isConstraint");
else then false;
else then false;
end match;
end hasConTermAnno;

Expand Down
28 changes: 14 additions & 14 deletions Compiler/BackEnd/DynamicOptimization.mo
Expand Up @@ -28,7 +28,7 @@
* See the full OSMC Public License conditions for more details.
*
*/

encapsulated package DynamicOptimization

" file: DynamicOptimization.mo
Expand Down Expand Up @@ -103,7 +103,7 @@ algorithm
then (v, e,inClassAttr);
case (v, e, true, _, _, _)
equation

leftcref = ComponentReference.makeCrefIdent("$OMC$objectMayerTerm", DAE.T_REAL_DEFAULT, {});
dummyVar = BackendDAE.VAR(leftcref, BackendDAE.VARIABLE(), DAE.OUTPUT(), DAE.NON_PARALLEL(), DAE.T_REAL_DEFAULT, NONE(), NONE(), {}, DAE.emptyElementSource, NONE(), NONE(), DAE.NON_CONNECTOR());
mayer1 = findMayerTerm(inVars, knvars);
Expand All @@ -120,10 +120,10 @@ algorithm
b = not List.isEmpty(objectEqn);
v = Util.if_(b, BackendVariable.addNewVar(dummyVar, v), v);
e = Util.if_(b, listAppend(e, objectEqn), e);

constraint = addConstraints(inVars, knvars, inConstraint);
(v, e) = addOptimizationVarsEqns2(constraint, 1, v, e, knvars);

then (v, e,{DAE.OPTIMIZATION_ATTRS(mayer1, lagrange1, NONE(), NONE())});
else then(inVars, inEqns, inClassAttr);
end match;
Expand Down Expand Up @@ -168,7 +168,7 @@ protected function addOptimizationVarsEqns2
input BackendDAE.Variables inVars;
input list<BackendDAE.Equation> inEqns;
input BackendDAE.Variables knvars;

output BackendDAE.Variables outVars;
output list<BackendDAE.Equation> outEqns;
algorithm
Expand All @@ -195,7 +195,7 @@ output Option<DAE.Exp> mayer;
algorithm
mayer := match(inVars, knvars)
local list<BackendDAE.Var> varlst; BackendDAE.Variables v;

case(_, _) equation
v = BackendVariable.mergeVariables(inVars, knvars);
varlst = BackendVariable.varList(v);
Expand All @@ -214,7 +214,7 @@ output Option<DAE.Exp> mayer;
algorithm
mayer := match(inVars, knvars)
local list<BackendDAE.Var> varlst; BackendDAE.Variables v;

case(_, _) equation
v = BackendVariable.mergeVariables(inVars, knvars);
varlst = BackendVariable.varList(v);
Expand All @@ -234,9 +234,9 @@ output Option<DAE.Exp> mayer;

algorithm
mayer := match(varlst, Inmayer)
local list<BackendDAE.Var> varlst; BackendDAE.Var v;
local list<BackendDAE.Var> varlst; BackendDAE.Var v;
DAE.Exp e, e2, e3; Option<DAE.Exp> opte; DAE.ComponentRef cr;

case({},NONE()) then NONE();
case({},opte as SOME(e)) then opte;
case(v::varlst, SOME(e)) equation
Expand Down Expand Up @@ -264,14 +264,14 @@ output Option<DAE.Exp> mayer;
algorithm
mayer := match(inmayer1, inmayer2)
local DAE.Exp e1, e2, e3;

case(SOME(e1), SOME(e2)) equation
e3 = Expression.expAdd(e1,e2);
then SOME(e3);
case(NONE(), SOME(e2)) then SOME(e2);
case(SOME(e1), NONE()) then SOME(e1);
case(NONE(), NONE()) then NONE();

end match;
end mergeObjectVars;

Expand All @@ -285,7 +285,7 @@ output list< .DAE.Constraint> outConstraint;
algorithm
outConstraint := match(inVars, knvars, inConstraint)
local list<BackendDAE.Var> varlst; BackendDAE.Variables v; list< .DAE.Exp> constraintLst; list< .DAE.Constraint> constraint;

case(_, _, {DAE.CONSTRAINT_EXPS(constraintLst = constraintLst)}) equation
//print("\n1-->");
v = BackendVariable.mergeVariables(inVars, knvars);
Expand Down Expand Up @@ -318,7 +318,7 @@ algorithm
outConstraint := match(inConstraintLst, inVarlst)
local list<BackendDAE.Var> varlst; list< .DAE.Exp> constraintLst;
BackendDAE.Var v; .DAE.Exp e; DAE.ComponentRef cr; list< .DAE.Exp> ConstraintLst;

case({}, {}) then {};
case({}, v::varlst) equation
cr = BackendVariable.varCref(v);
Expand All @@ -329,7 +329,7 @@ algorithm
e = DAE.CREF(cr, DAE.T_REAL_DEFAULT);
then addConstraints2(e::ConstraintLst,varlst);
else then(inConstraintLst);

end match;
end addConstraints2;

Expand Down

0 comments on commit 812fe69

Please sign in to comment.