Changeset e668b3ca in OpenModelica

Timestamp:

2022-05-17T20:22:52+02:00 (2 years ago)

Author:

kabdelhak <karim.abdelhak@…>

Children:

9d6e2961

Parents:

ed50d7d

git-author:

perost <perost86@…> (05/09/22 11:54:20)

git-committer:

kabdelhak <karim.abdelhak@…> (05/17/22 20:22:52)

Message:

Add simplification rules for min({})/max({}) (#8909)

Files:

• OMCompiler/Compiler/NFFrontEnd/NFSimplifyExp.mo (modified) (2 diffs)
• testsuite/flattening/modelica/scodeinst/FuncBuiltinMax2.mo (added)
• testsuite/flattening/modelica/scodeinst/FuncBuiltinMin2.mo (added)
• testsuite/flattening/modelica/scodeinst/Makefile (modified) (1 diff)

OMCompiler/Compiler/NFFrontEnd/NFSimplifyExp.mo

@@ -253 +253 @@
     case "fill"      then simplifyFill(listHead(args), listRest(args), call);
     case "homotopy"  then simplifyHomotopy(args, call);
-    case "max"       guard listLength(args) == 1 then simplifyReducedArrayConstructor(listHead(args), call);
-    case "min"       guard listLength(args) == 1 then simplifyReducedArrayConstructor(listHead(args), call);
+    case "max"       then simplifyMinMax(args, call, isMin = false);
+    case "min"       then simplifyMinMax(args, call, isMin = true);
     case "ones"      then simplifyFill(Expression.INTEGER(1), args, call);
     case "product"   then simplifySumProduct(listHead(args), call, isSum = false);
@@ -265 +265 @@
   end match;
 end simplifyBuiltinCall;
+
+function simplifyMinMax
+  input list<Expression> args;
+  input Call call;
+  input Boolean isMin;
+  output Expression exp;
+protected
+  Expression arg;
+  Type ty;
+algorithm
+  if listLength(args) == 1 then
+    arg := listHead(args);
+    ty := Expression.typeOf(arg);
+
+    if Type.isEmptyArray(ty) then
+      ty := Type.arrayElementType(ty);
+      exp := if isMin then Expression.makeMaxValue(ty) else
+                           Expression.makeMinValue(ty);
+    else
+      exp := simplifyReducedArrayConstructor(arg, call);
+    end if;
+  else
+    exp := Expression.CALL(call);
+  end if;
+end simplifyMinMax;
 
 function simplifySumProduct

testsuite/flattening/modelica/scodeinst/Makefile

@@ -525 +525 @@
 FuncBuiltinMatrixWrongType1.mo \
 FuncBuiltinMax.mo \
+FuncBuiltinMax2.mo \
 FuncBuiltinMin.mo \
+FuncBuiltinMin2.mo \
 FuncBuiltinMod.mo \
 FuncBuiltinNdims.mo \