Changeset 13923

Timestamp:

2012-11-16T15:35:27+01:00 (11 years ago)

Author:

jfrenkel

Message:

• additional fix for last commit

File:

• trunk/Compiler/BackEnd/BackendDAEOptimize.mo (modified) (5 diffs)

trunk/Compiler/BackEnd/BackendDAEOptimize.mo

@@ -706 +706 @@
         true = DAEUtil.expTypeComplex(ty);
         size = Expression.sizeOf(ty);
-          print("Add Equation:\n" +& BackendDump.equationStr(BackendDAE.COMPLEX_EQUATION(size,lhs,rhs,source)) +& "\n");
+        //  print("Add Equation:\n" +& BackendDump.equationStr(BackendDAE.COMPLEX_EQUATION(size,lhs,rhs,source)) +& "\n");
        then
         ((syst,shared,repl,BackendDAE.COMPLEX_EQUATION(size,lhs,rhs,source)::eqns,b));
@@ -715 +715 @@
         dims = Expression.arrayDimension(ty);
         ds = Expression.dimensionsSizes(dims);
-          print("Add Equation:\n" +& BackendDump.equationStr(BackendDAE.ARRAY_EQUATION(ds,lhs,rhs,source)) +& "\n");
+        //  print("Add Equation:\n" +& BackendDump.equationStr(BackendDAE.ARRAY_EQUATION(ds,lhs,rhs,source)) +& "\n");
       then
         ((syst,shared,repl,BackendDAE.ARRAY_EQUATION(ds,lhs,rhs,source)::eqns,b));
@@ -724 +724 @@
         b2 = DAEUtil.expTypeArray(ty);
         false = b1 or b2;
-          print("Add Equation:\n" +& BackendDump.equationStr(BackendDAE.EQUATION(lhs,rhs,source)) +& "\n");
+        //  print("Add Equation:\n" +& BackendDump.equationStr(BackendDAE.EQUATION(lhs,rhs,source)) +& "\n");
         //Error.assertionOrAddSourceMessage(not b1,Error.INTERNAL_ERROR,{str}, Absyn.dummyInfo);
       then
@@ -824 +824 @@
     case(_,_,_,_,_,_,_,(syst,shared,_,_,_))
       equation
-          print("Found Alias " +& ComponentReference.printComponentRefStr(cr1) +& " = " +& ComponentReference.printComponentRefStr(cr2) +& " Negate:" +& boolString(negate) +& ".\n");
+        //  print("Found Alias " +& ComponentReference.printComponentRefStr(cr1) +& " = " +& ComponentReference.printComponentRefStr(cr2) +& " Negate:" +& boolString(negate) +& ".\n");
         // get Variables
         (vars1,ilst1,varskn1,time1) =  getVars(cr1,syst,shared);
@@ -10283 +10283 @@
     case (BackendDAE.DAE(systs,BackendDAE.SHARED(knvars,exobj,aliasVars,inieqns,remeqns,constrs,clsAttrs,cache,env,funcTree,eventInfo,eoc,btp,symjacs)))
       equation
+        _ = BackendDAEUtil.traverseBackendDAEExpsEqnsWithUpdate(inieqns,traversersimplifyTimeIndepFuncCalls,(knvars,aliasVars,false));
         _ = BackendDAEUtil.traverseBackendDAEExpsEqnsWithUpdate(remeqns,traversersimplifyTimeIndepFuncCalls,(knvars,aliasVars,false));
       then