Changeset dd0c8bd4 in OpenModelica

Timestamp:

2016-03-21T13:39:36+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:

5d60737

Parents:

34e4a4c

git-author:

vruge <vruge@…> (03/21/16 13:39:36)

git-committer:

hudson <openmodelica@…> (03/21/16 13:39:36)

Message:

improved ExpressionSolve

File:

• Compiler/BackEnd/ExpressionSolve.mo (modified) (4 diffs)

Compiler/BackEnd/ExpressionSolve.mo

@@ -111 +111 @@
 
 protected function solveSimpleEquationsWork
-  input BackendDAE.Equation inEqn;
+  input output BackendDAE.Equation eqn;
   input BackendDAE.Var var "solve eq with respect to var";
   input BackendDAE.Shared shared;
-  output BackendDAE.Equation outEqn;
   output Boolean solved;
 
@@ -120 +119 @@
   DAE.ComponentRef cr;
   DAE.Exp e1,e2,varexp,e;
-
   BackendDAE.EquationAttributes attr;
   DAE.ElementSource source;
-  list<DAE.Statement> asserts = {};
-algorithm
-  BackendDAE.EQUATION(exp=e1, scalar=e2, source=source,attr=attr) := inEqn;
+algorithm
+  BackendDAE.EQUATION(exp=e1, scalar=e2, source=source,attr=attr) := eqn;
+  if not (Types.isIntegerOrRealOrSubTypeOfEither(Expression.typeof(e1)) and Types.isIntegerOrRealOrSubTypeOfEither(Expression.typeof(e2))) then
+    return ;
+  end if;
   BackendDAE.VAR(varName = cr) := var;
   varexp := Expression.crefExp(cr);
@@ -133 +133 @@
   end if;
 
+  (e1, e2) := preprocessingSolve(e1, e2, varexp, SOME(shared.functionTree), NONE(), 0);
+
   try
-    (e1, e2) := preprocessingSolve(e1, e2, varexp, SOME(shared.functionTree), NONE(), 0);
-  else
-    // no number
-  end try;
-
-  try
-    (e, asserts) := solve2(e1, e2, varexp, SOME(shared.functionTree), NONE());
-    source := DAEUtil.addSymbolicTransformationSolve(true, source, cr, e1, e2, e, asserts);
-    outEqn := BackendEquation.generateEquation(varexp, e, source, attr);
+    e := solve2(e1, e2, varexp, SOME(shared.functionTree), NONE());
+    source := DAEUtil.addSymbolicTransformationSolve(true, source, cr, e1, e2, e, {});
+    eqn := BackendEquation.generateEquation(varexp, e, source, attr);
     solved := true;
   else
     //eqn is change by possible simplification inside preprocessingSolve for solve the eqn with respect to varexp
     //source := DAEUtil.addSymbolicTransformationSimplify(true, source, DAE.PARTIAL_EQUATION(e1), DAE.PARTIAL_EQUATION(e2));
-    outEqn := BackendEquation.generateEquation(e1, e2, source, attr);
+    eqn := BackendEquation.generateEquation(e1, e2, source, attr);
     solved := false;
   end try;
@@ -303 +299 @@
                          end matchcontinue;
 
- eqnForNewVars := List.appendNoCopy(eqnForNewVars, eqnForNewVars1);
- newVarsCrefs := List.appendNoCopy(newVarsCrefs, newVarsCrefs1);
+ if isPresent(eqnForNewVars) then
+   eqnForNewVars := List.appendNoCopy(eqnForNewVars, eqnForNewVars1);
+   newVarsCrefs := List.appendNoCopy(newVarsCrefs, newVarsCrefs1);
+ end if;
 
 end solveWork;