- BackendDAETransform.mo

  - got ride of some unused print calls
- BackendDump.mo
  - add function dumpStateVariables
- fix tests from testcase, now more trivial equation are detected

git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@7318 f25d12d1-65f4-0310-ae8a-bbce733d8d8e

Author: Jens Frenkel

Compiler/BackendDAETransform.mo

@@ -1198,13 +1198,13 @@ algorithm
     case (dae,m,mt,nv,nf,i,inFunctions,derivedAlgs,derivedMultiEqn)
       equation
         eqns = BackendDAEEXT.getMarkedEqns();
-        // print("marked equations:");print(Util.stringDelimitList(Util.listMap(eqns,intString),","));
-        // print("\n");
+        //print("marked equations:");print(Util.stringDelimitList(Util.listMap(eqns,intString),","));
+        //print("\n");
         diff_eqns = BackendDAEEXT.getDifferentiatedEqns();
         eqns_1 = Util.listSetDifferenceOnTrue(eqns, diff_eqns, intEq);
         // print("differentiating equations:");print(Util.stringDelimitList(Util.listMap(eqns_1,intString),","));
         // print("\n");
-        // print(BackendDump.dumpMarkedEqns(dae, eqns_1));
+        //  print(BackendDump.dumpMarkedEqns(dae, eqns_1));
 
         // Collect the states in the equations that are singular, i.e. composing a constraint between states.
         // Note that states are collected from -all- marked equations, not only the differentiated ones.
@@ -2380,16 +2380,16 @@ algorithm
 
         (eqn_1,al1,derivedAlgs,ae1,derivedMultiEqn,true) = Derive.differentiateEquationTime(eqn, v, inFunctions, al,inDerivedAlgs,ae,inDerivedMultiEqn);
         Debug.fprint("bltdump", "High index problem, differentiated equation: ") "update equation row in IncidenceMatrix" ;
-        str = BackendDump.equationStr(eqn);
-        //print( "differentiated equation ") ;
-        Debug.fprint("bltdump", str)  ;
-        //print(str); print("\n");
+        //str = BackendDump.equationStr(eqn);
+        // print( "differentiated equation ") ;
+        Debug.fprint("bltdump", BackendDump.equationStr(eqn));
+        // print(str); print("\n");
         Debug.fprint("bltdump", " to ");
-        //print(" to ");
-        str = BackendDump.equationStr(eqn_1);
-        //print(str);
+        // print(" to ");
+        // str = BackendDump.equationStr(eqn_1);
+        // print(str);
         //print("\n");
-        Debug.fprint("bltdump", str) "  print \" to \" & print str &  print \"\\n\" &" ;
+        Debug.fprint("bltdump", BackendDump.equationStr(eqn_1)) "  print \" to \" & print str &  print \"\\n\" &" ;
         Debug.fprint("bltdump", "\n");
         eqns_1 = BackendEquation.equationAdd(eqns, eqn_1);
         leneqns = BackendDAEUtil.equationSize(eqns_1);
@@ -2404,16 +2404,16 @@ algorithm
 
         (eqn_1,al1,derivedAlgs,ae1,derivedMultiEqn,false) = Derive.differentiateEquationTime(eqn, v, inFunctions, al,inDerivedAlgs,ae,inDerivedMultiEqn);
         Debug.fprint("bltdump", "High index problem, differentiated equation: ") "update equation row in IncidenceMatrix" ;
-        str = BackendDump.equationStr(eqn);
-        //print( "differentiated equation ") ;
-        Debug.fprint("bltdump", str)  ;
-        //print(str); print("\n");
+        // str = BackendDump.equationStr(eqn);
+        // print( "differentiated equation ") ;
+        Debug.fprint("bltdump", BackendDump.equationStr(eqn));
+        // print(str); print("\n");
         Debug.fprint("bltdump", " to ");
-        //print(" to ");
-        str = BackendDump.equationStr(eqn_1);
-        //print(str);
-        //print("\n");
-        Debug.fprint("bltdump", str) "  print \" to \" & print str &  print \"\\n\" &" ;
+        // print(" to ");
+        // str = BackendDump.equationStr(eqn_1);
+        // print(str);
+        // print("\n");
+        Debug.fprint("bltdump", BackendDump.equationStr(eqn_1)) "  print \" to \" & print str &  print \"\\n\" &" ;
         Debug.fprint("bltdump", "\n");
         leneqns = BackendDAEUtil.equationSize(eqns);
         BackendDAEEXT.markDifferentiated(e) "length gives index of new equation Mark equation as differentiated so it won\'t be differentiated again" ;

Compiler/BackendDump.mo

@@ -1396,7 +1396,7 @@ algorithm
         // does not work
         //e = BaseHashTable.get(cr,varMappings);
         e = BackendVariable.varBindExp(v);
-        scr = ComponentReference.crefStr(cr);
+        scr = ComponentReference.printComponentRefStr(cr);
         se = ExpressionDump.printExpStr(e);
         s = stringAppendList({scr," = ",se,"\n"});
         print(s);
@@ -1405,4 +1405,41 @@ algorithm
   end matchcontinue;
 end dumpAliasVariable;
 
+public function dumpStateVariables "function: dumpStateVariables
+  author: Frenkel TUD 2010-12
+
+  dump State Variables.
+"
+  input BackendDAE.Variables inVars;
+algorithm
+  print("States Variables\n");
+  print("=================\n");
+  _ := BackendVariable.traverseBackendDAEVars(inVars,dumpStateVariable,1);
+  print("\n");
+end dumpStateVariables;
+
+protected function dumpStateVariable
+"autor: Frenkel TUD 2010-11"
+ input tuple<BackendDAE.Var, Integer> inTpl;
+ output tuple<BackendDAE.Var, Integer> outTpl;
+algorithm
+  outTpl:=
+  matchcontinue (inTpl)
+    local
+      BackendDAE.Var v;
+      DAE.ComponentRef cr;
+      String scr;
+      Integer pos;
+    case ((v,pos))
+      equation
+        true = BackendVariable.isStateVar(v);
+        cr = BackendVariable.varCref(v);
+        scr = ComponentReference.printComponentRefStr(cr);
+        print(intString(pos)); print(": ");
+        print(scr); print("\n");
+      then ((v,pos+1));
+    case inTpl then inTpl; 
+  end matchcontinue;
+end dumpStateVariable;
+
 end BackendDump;