Changeset ad1689a in OpenModelica

Timestamp:

2016-03-21T10:21:18+01:00 (8 years ago)

Author:

hudson <openmodelica@…>

Branches:

Added-citation-metadata, maintenance/v1.14, maintenance/v1.15, maintenance/v1.16, maintenance/v1.17, maintenance/v1.18, maintenance/v1.19, maintenance/v1.20, maintenance/v1.21, maintenance/v1.22, maintenance/v1.23, master, omlib-staging

Children:

6bd48ef

Parents:

01b9dd9

git-author:

vruge <vruge@…> (03/21/16 10:21:18)

git-committer:

hudson <openmodelica@…> (03/21/16 10:21:18)

Message:

improved solveSimpleEquations

File:

• Compiler/BackEnd/ExpressionSolve.mo (modified) (1 diff)

Compiler/BackEnd/ExpressionSolve.mo

@@ -65 +65 @@
 
 public function solveSimpleEquations
-  input BackendDAE.BackendDAE inDAE;
-  output BackendDAE.BackendDAE outDAE = inDAE;
-protected
-  BackendDAE.Equation eqn;
-  BackendDAE.Var var;
-  Integer iComp;
-  Integer eindex,vindx;
-  BackendDAE.StrongComponents comps;
-  array<Integer> ass1 "eqn := ass1[var]";
-  array<Integer> ass2 "var := ass2[eqn]";
-  Boolean solved;
-
-  list<BackendDAE.EqSystem> systlst = {};
-algorithm
-
- for syst in inDAE.eqs loop
-   BackendDAE.MATCHING(comps=comps,ass1=ass1, ass2=ass2) := syst.matching;
-   iComp := 1;
-   for comp in comps loop
-     if BackendDAEUtil.isSingleEquationComp(comp) then
+  input output BackendDAE.BackendDAE DAE;
+algorithm
+
+DAE.eqs := list( (match syst
+              local
+                BackendDAE.StrongComponents comps;
+                array<Integer> ass1 "eqn := ass1[var]";
+               array<Integer> ass2 "var := ass2[eqn]";
+
+   case BackendDAE.EQSYSTEM(matching = BackendDAE.MATCHING(comps=comps,ass1=ass1, ass2=ass2))
+   algorithm
+   comps := list( (match comp
+     local
+       BackendDAE.Equation eqn;
+       BackendDAE.Var var;
+       Integer eindex,vindx;
+       Boolean solved;
+       BackendDAE.StrongComponent tmpComp;
+
+    case BackendDAE.SINGLEEQUATION()
+      algorithm
        BackendDAE.SINGLEEQUATION(eqn=eindex,var=vindx) := comp;
        eqn := BackendEquation.equationNth1(syst.orderedEqs, eindex);
        var := BackendVariable.getVarAt(syst.orderedVars, vindx);
-
+       tmpComp := comp;
        if BackendEquation.isEquation(eqn) then
-         (eqn,solved) := solveSimpleEquationsWork(eqn, var, outDAE.shared);
+         (eqn,solved) := solveSimpleEquationsWork(eqn, var, DAE.shared);
          syst.orderedEqs := BackendEquation.setAtIndex(syst.orderedEqs, eindex, eqn);
 
          if not solved then
-           comp := BackendDAE.EQUATIONSYSTEM({eindex}, {vindx}, BackendDAE.EMPTY_JACOBIAN() ,BackendDAE.JAC_NONLINEAR(), false);
-           comps := List.replaceAt(comp, iComp, comps);
+           tmpComp := BackendDAE.EQUATIONSYSTEM({eindex}, {vindx}, BackendDAE.EMPTY_JACOBIAN() ,BackendDAE.JAC_NONLINEAR(), false);
          end if;
-
        end if; // isEquation
-     end if; // isSingleEquationComp
-     iComp := iComp + 1;
-   end for; //comp
-  syst.matching := BackendDAE.MATCHING(ass1, ass2, comps);
-  systlst := syst :: systlst;
- end for; // syst
-
- outDAE.eqs := listReverse(systlst); // listReverse needed?
+       then tmpComp;
+     else
+       comp;
+     end match) for comp in comps);
+     syst.matching := BackendDAE.MATCHING(ass1, ass2, comps);
+     then syst;
+    else syst;
+ end match)
+for syst in DAE.eqs);
+
 end solveSimpleEquations;