Changeset 6650324 in OpenModelica

Timestamp:

2014-12-17T22:35:19+01:00 (9 years ago)

Author:

Vitalij Ruge <vitalij.ruge@…>

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:

0312dda

Parents:

2c02aad5

Message:

ExpressionSolve: added case for quadratic equation

• a*x^{n - b*x}m

git-svn-id: ​https://openmodelica.org/svn/OpenModelica/trunk@23839 f25d12d1-65f4-0310-ae8a-bbce733d8d8e

File:

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

Compiler/BackEnd/ExpressionSolve.mo

@@ -1428 +1428 @@
   then(lhs, rhs, true, eqnForNewVars_, newVarsCrefs_, idepth + 1);
 
+  // a*x^n - b*x^m = c
+  case(DAE.BINARY(ee1, DAE.SUB(), ee2),_)
+  equation
+    (z1, z2) = List.split1OnTrue(Expression.factors(ee1), expHasCref, inExp3);
+    (z3, z4) = List.split1OnTrue(Expression.factors(ee2), expHasCref, inExp3);
+
+    x1 = makeProductLstSort(z1);
+    a1 = makeProductLstSort(z2);
+
+    x2 = makeProductLstSort(z3);
+    a2 = Expression.negate(makeProductLstSort(z4));
+/*
+    print("\nx1 = ");print(ExpressionDump.printExpStr(x1));
+    print("\nx2 = ");print(ExpressionDump.printExpStr(x2));
+    print("\na1 = ");print(ExpressionDump.printExpStr(a1));
+    print("\na2 = ");print(ExpressionDump.printExpStr(a2));
+*/
+    a = simplifyBinaryMulCoeff(x1);
+    c = simplifyBinaryMulCoeff(x2);
+    (e2 ,e3) = a;
+    (e5, e6) = c;
+    (lhs, rhs, eqnForNewVars_, newVarsCrefs_) = solveQE(a1,e2,e3,a2,e5,e6,inExp2,inExp3,ieqnForNewVars,inewVarsCrefs,uniqueEqIndex,idepth);
+  then(lhs, rhs, true, eqnForNewVars_, newVarsCrefs_, idepth + 1);
+
 
   else (inExp1, inExp2, false, ieqnForNewVars, inewVarsCrefs, idepth);