Changeset f1c754b4 in OpenModelica

Timestamp:

2014-10-14T16:19:12+02:00 (10 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:

997af4ed

Parents:

c030536

Message:

improved solver rule for

pow(f(x),y) = g(z) => f(x) = h(pre(x))*pow(g(z),1/y)

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

File:

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

Compiler/BackEnd/ExpressionSolve.mo

@@ -282 +282 @@
        then
          (res,asserts);
-    // f(a)^n = c => f(a) = c^(1/n)
+    // f(a)^x = c => f(a) = {+,-}*c^(1/x)
     // where n is odd
-    case (DAE.BINARY(e1,DAE.POW(_),e2 as DAE.RCONST(r)), _, DAE.CREF(componentRef = cr))
+    case (DAE.BINARY(e1,DAE.POW(tp),e2), _, DAE.CREF(componentRef = cr))
        equation
-         1.0 = realMod(r,2.0);
          false = Expression.expHasCref(inExp2, cr);
          true = Expression.expHasCref(e1, cr);
+         false = Expression.expHasCref(e2, cr);
          res = Expression.expDiv(DAE.RCONST(1.0),e2);
          res = Expression.expPow(inExp2,res);
          (res, asserts) = solve(e1,res,inExp3);
+         e11 = Expression.makePureBuiltinCall("pre",{inExp3},tp);
+         e11 = DAE.IFEXP(DAE.RELATION(e11,DAE.GREATEREQ(tp),DAE.RCONST(0.0),-1,NONE()),DAE.RCONST(1.0),DAE.RCONST(-1.0));
+         res = Expression.expMul(e11,res);
        then
          (res,asserts);