Changeset 1019c41e in OpenModelica for OMCompiler/Compiler/NFFrontEnd/NFSimplifyModel.mo

Timestamp:

2020-10-21T15:09:21+02:00 (4 years ago)

Author:

Adrian Pop <adrian.pop@…>

Children:

9960cdcd

Parents:

5c431b26

git-author:

Per Östlund <perost86@…> (10/20/20 12:57:27)

git-committer:

Adrian Pop <adrian.pop@…> (10/21/20 15:09:21)

Message:

Array connection improvements.

• Make sure all iterators get unique components when creating them and not sharing a constant literal, to make the simplification for removing unused for loops work correctly.
• Avoid creating unnecessary for loops for ranges with the same lower and upper bound.

File:

• OMCompiler/Compiler/NFFrontEnd/NFSimplifyModel.mo (modified) (3 diffs)

OMCompiler/Compiler/NFFrontEnd/NFSimplifyModel.mo

@@ -161 +161 @@
     case Equation.FOR(range = SOME(e))
       algorithm
-        if not Equation.containsExpList(eq.body, function Expression.containsIterator(iterator = eq.iterator)) then
-          body := simplifyEquations(eq.body);
+        body := simplifyEquations(eq.body);
+
+        if not Equation.containsExpList(body, function Expression.containsIterator(iterator = eq.iterator)) then
           equations := List.append_reverse(body, equations);
         else
@@ -171 +172 @@
           //  e := Expression.applySubscript(Subscript.INDEX(Expression.INTEGER(1)), e);
 
-          //  body := Equation.mapExpList(eq.body,
+          //  body := Equation.mapExpList(body,
           //    function Expression.replaceIterator(iterator = eq.iterator, iteratorValue = e));
           //  body := simplifyEquations(body);
@@ -177 +178 @@
           //elseif not Dimension.isZero(dim) then
             eq.range := SimplifyExp.simplifyOpt(eq.range);
-            eq.body := simplifyEquations(eq.body);
+            eq.body := body;
             equations := eq :: equations;
           //end if;