[BE] fixes for inStream

see.: https://trac.openmodelica.org/OpenModelica/ticket/3885#comment:15 Belonging to [master]: - OpenModelica/OMCompiler#2622
OpenModelica · Aug 29, 2018 · 13b403f · 13b403f
1 parent 49624ef
commit 13b403f
Showing 1 changed file with 25 additions and 16 deletions.
diff --git a/Compiler/BackEnd/BackendDAEOptimize.mo b/Compiler/BackEnd/BackendDAEOptimize.mo
@@ -154,39 +154,48 @@ algorithm
       DAE.ComponentRef cr;
       DAE.Exp e, expr, a, b;
       Option<DAE.Exp> eMin, eMax;
-      Boolean isZero;
+      Boolean simplifyToZero;
 
-    case DAE.CALL(path=Absyn.IDENT("$OMC$PositiveMax"),expLst={e as DAE.CREF(componentRef=cr), expr}) algorithm
+    // positiveMax(cref, eps) = 0 if variable(cref).max <= 0
+    case DAE.CALL(path=Absyn.IDENT("$OMC$PositiveMax"),expLst={e as DAE.CREF(componentRef=cr), expr})
+    algorithm
       (eMin, eMax) := simplifyInStreamWorkExpresion(cr, outVars);
-      isZero := simplifyInStreamWorkSimplify(eMin, false);
+      simplifyToZero := simplifyInStreamWorkSimplify(eMax, true); // var.max <= 0.0
       tp := ComponentReference.crefTypeFull(cr);
-    then if isZero then Expression.createZeroExpression(tp) else Expression.makePureBuiltinCall("max", {e, expr}, tp);
+    then
+       if simplifyToZero then Expression.createZeroExpression(tp) else Expression.makePureBuiltinCall("max", {e, expr}, tp);
 
-    case DAE.CALL(path=Absyn.IDENT("$OMC$PositiveMax"),expLst={e as DAE.UNARY(DAE.UMINUS(tp), DAE.CREF(componentRef=cr)), expr}) algorithm
+    //positiveMax(-cref, eps) = 0 if variable(cref).min >= 0
+    case DAE.CALL(path=Absyn.IDENT("$OMC$PositiveMax"),expLst={e as DAE.UNARY(DAE.UMINUS(tp), DAE.CREF(componentRef=cr)), expr})
+    algorithm
       (eMin, eMax) := simplifyInStreamWorkExpresion(cr, outVars);
-      isZero := simplifyInStreamWorkSimplify(eMax, true);
-    then if isZero then Expression.createZeroExpression(tp) else Expression.makePureBuiltinCall("max", {e, expr}, tp);
+      simplifyToZero := simplifyInStreamWorkSimplify(eMin, false); // var.min >= 0.0
+    then
+       if simplifyToZero then Expression.createZeroExpression(tp) else Expression.makePureBuiltinCall("max", {e, expr}, tp);
 
-    case DAE.CALL(path=Absyn.IDENT("$OMC$PositiveMax"),expLst={e, expr}) guard Expression.isZero(e)
+    //positiveMax(-cref, eps) = -cref where variable is constant <= 0
+    case DAE.CALL(path=Absyn.IDENT("$OMC$PositiveMax"),expLst={e, expr}) guard Expression.isNegativeOrZero(e)
     then e;
 
     case DAE.CALL(path=Absyn.IDENT("$OMC$PositiveMax"),expLst={e, expr})
       //print("\nsimplifyInStreamWork: ");
       //print(ExpressionDump.printExpStr(inExp));
       //print(" <-> ");
       //print(ExpressionDump.printExpStr(e));
-    then Expression.makePureBuiltinCall("max", {e, expr}, Expression.typeof(e));
+    then
+      Expression.makePureBuiltinCall("max", {e, expr}, Expression.typeof(e));
 
     case DAE.CALL(path=Absyn.IDENT("$OMC$inStreamDiv"),expLst={e, expr})
       algorithm
           e := ExpressionSimplify.simplify(e);
           expr := match(e)
-                      case DAE.BINARY(a, DAE.DIV(), b)
-                        guard Expression.isZero(a) and Expression.isZero(b)
-                      then
-                        expr;
-                      else
-                        e;
+
+                  case DAE.BINARY(a, DAE.DIV(), b)
+                  guard Expression.isZero(a) and Expression.isZero(b)
+                  then expr;
+
+                  else e;
+
                  end match;
       then
          expr;
@@ -207,7 +216,7 @@ algorithm
     try
       (v, _) := BackendVariable.getVarSingle(cr, vars);
       (outMin, outMax) := BackendVariable.getMinMaxAttribute(v);
-      return;
+      break;
     else
       // search
     end try;