Changeset 0802d69 in OpenModelica

Timestamp:

2021-11-23T14:40:44+01:00 (2 years ago)

Author:

GitHub <noreply@…>

Branches:

maintenance/v1.19, maintenance/v1.20, maintenance/v1.21, maintenance/v1.22, maintenance/v1.23, master, omlib-staging

Children:

d519288

Parents:

0aeaad6

git-author:

perost <perost86@…> (11/23/21 14:40:44)

git-committer:

GitHub <noreply@…> (11/23/21 14:40:44)

Message:

Improve evaluation in ranges (#8203)

• When evaluating anything in a range in EvalConstants, retype the whole range rather than evaluating the type since it's faster and gives better results, and also fixes some issues with -d=-nfScalarize.

File:

• OMCompiler/Compiler/NFFrontEnd/NFEvalConstants.mo (modified) (1 diff)

OMCompiler/Compiler/NFFrontEnd/NFEvalConstants.mo

@@ -207 +207 @@
       then Expression.SIZE(exp.exp, evaluateExpOpt(exp.dimIndex, info));
 
+    case Expression.RANGE()
+      algorithm
+        (outExp, outChanged) := Expression.mapFoldShallow(exp,
+          function evaluateExpTraverser(info = info), false);
+
+        // If anything in a range is evaluated its better to just retype it
+        // rather than evaluating the type, since it's usually faster and gives
+        // better results in some cases.
+        if outChanged then
+          outExp := Expression.retype(outExp);
+        end if;
+      then
+        outExp;
+
     else
       algorithm