[BE] Add unique index of stateSets as attribute

Belonging to [master]:
  - #3046

Author: kabdelhak

Compiler/BackEnd/BackendDAE.mo

@@ -609,6 +609,7 @@ type StateSets = list<StateSet> "List of StateSets";
 public
 uniontype StateSet
   record STATESET
+    Integer index;
     Integer rang; // how many states are needed?
     list< .DAE.ComponentRef> state;
     .DAE.ComponentRef crA "set.x=A*states";

Compiler/BackEnd/IndexReduction.mo

@@ -72,6 +72,7 @@ import List;
 import Matching;
 import SCode;
 import Sorting;
+import SymbolicJacobian;
 import System;
 import Util;
 
@@ -1311,7 +1312,7 @@ protected function dynamicStateSelectionWork
   output BackendDAE.EqSystem osyst;
   output BackendDAE.Shared oshared;
   output HashTableCrIntToExp.HashTable oHt;
-  output Integer oSetIndex;
+  output Integer oSetIndex=iSetIndex;
 protected
   BackendDAE.StateOrder so;
   BackendDAE.ConstraintEquations orgEqnsLst;
@@ -1544,7 +1545,7 @@ protected function addStateSets
   input StateSets iTplLst;
   input Integer iSetIndex;
   input BackendDAE.EqSystem inSystem;
-  output Integer oSetIndex;
+  output Integer oSetIndex=iSetIndex;
   output BackendDAE.EqSystem oSystem;
 algorithm
   (oSetIndex,oSystem) := match(iTplLst,inSystem)
@@ -1644,8 +1645,8 @@ algorithm
     stateCandidates := List.map1(stateCandidates,BackendVariable.setVarKind,BackendDAE.DUMMY_STATE());
     otherVars := List.map1(otherVars,BackendVariable.setVarKind,BackendDAE.DUMMY_STATE());
 
+    oStateSets := BackendDAE.STATESET(oSetIndex,rang,crset,crA,aVars,stateCandidates,otherVars,cEqnsLst,oEqnLst,crJ,varJ,BackendDAE.EMPTY_JACOBIAN())::oStateSets;
     oSetIndex := oSetIndex + 1;
-    oStateSets := BackendDAE.STATESET(rang,crset,crA,aVars,stateCandidates,otherVars,cEqnsLst,oEqnLst,crJ,varJ,BackendDAE.EMPTY_JACOBIAN())::oStateSets;
   end for;
 end generateStateSets;
 
@@ -1663,7 +1664,7 @@ protected function setStartExp
   input Integer size;
   input Integer iIndex;
   output BackendDAE.Var outVar;
-  output Integer oIndex;
+  output Integer oIndex=iIndex;
 protected
   DAE.Exp e;
 algorithm
@@ -1690,7 +1691,7 @@ protected function selectStates
   output BackendDAE.EqSystem osyst;
   output BackendDAE.Shared oshared;
   output HashTableCrIntToExp.HashTable oHt;
-  output Integer oSetIndex;
+  output Integer oSetIndex=iSetIndex;
 algorithm
   (osyst,oshared,oHt,oSetIndex) := matchcontinue inSystem
     local
@@ -1777,7 +1778,7 @@ protected function selectStatesWork
   output BackendDAE.EqSystem osyst;
   output BackendDAE.Shared oshared;
   output HashTableCrIntToExp.HashTable oHt;
-  output Integer oSetIndex;
+  output Integer oSetIndex=iSetIndex;
 algorithm
   (osyst,oshared,oHt,oSetIndex) :=
   matchcontinue (inSystem, iOrgEqnsLst)

Compiler/BackEnd/RemoveSimpleEquations.mo

@@ -3840,7 +3840,7 @@ algorithm
   (oStateSets, outB, oStatesetrepl) := match(iStateSets, iStatesetrepl, vars, aliasVars, iAcc, inB)
     local
       BackendDAE.StateSets stateSets;
-      Integer rang;
+      Integer index, rang;
       list< DAE.ComponentRef> states;
       DAE.ComponentRef crA, crJ;
       list< BackendDAE.Var> varA, statescandidates, ovars, varJ;
@@ -3850,7 +3850,7 @@ algorithm
       Boolean b, b1;
       BackendDAE.Jacobian jac;
     case ({}, _, _, _, _, _) then (listReverse(iAcc), inB, iStatesetrepl);
-    case (BackendDAE.STATESET(rang, states, crA, varA, statescandidates, ovars, eqns, oeqns, crJ, varJ, jac)::stateSets, _, _, _, _, _)
+    case (BackendDAE.STATESET(index, rang, states, crA, varA, statescandidates, ovars, eqns, oeqns, crJ, varJ, jac)::stateSets, _, _, _, _, _)
       equation
         repl = getAliasReplacements(iStatesetrepl, aliasVars);
         // do not replace the set variables
@@ -3861,7 +3861,7 @@ algorithm
         (oeqns, b1) = BackendVarTransform.replaceEquations(oeqns, repl, SOME(BackendVarTransform.skipPreChangeEdgeOperator));
         oeqns = List.fold(oeqns, removeEqualLshRshEqns, {});
         oeqns = listReverse(oeqns);
-        (stateSets, b, oStatesetrepl) = removeAliasVarsStateSets(stateSets, SOME(repl), vars, aliasVars, BackendDAE.STATESET(rang, states, crA, varA, statescandidates, ovars, eqns, oeqns, crJ, varJ, jac)::iAcc, b or b1);
+        (stateSets, b, oStatesetrepl) = removeAliasVarsStateSets(stateSets, SOME(repl), vars, aliasVars, BackendDAE.STATESET(index, rang, states, crA, varA, statescandidates, ovars, eqns, oeqns, crJ, varJ, jac)::iAcc, b or b1);
       then
         (stateSets, b, oStatesetrepl);
   end match;

Compiler/BackEnd/SymbolicJacobian.mo

@@ -2945,7 +2945,7 @@ algorithm
       BackendDAE.StateSet stateSet;
       BackendDAE.Shared shared;
 
-      Integer rang;
+      Integer index, rang;
       list<DAE.ComponentRef> state;
       DAE.ComponentRef crA, crJ;
       list<BackendDAE.Var> varA, varJ, statescandidates, ovars;
@@ -2963,7 +2963,7 @@ algorithm
 
       String name;
 
-    case (BackendDAE.STATESET(rang=rang, state=state, crA=crA, varA=varA, statescandidates=statescandidates,
+    case (BackendDAE.STATESET(index=index, rang=rang, state=state, crA=crA, varA=varA, statescandidates=statescandidates,
       ovars=ovars, eqns=eqns, oeqns=oeqns, crJ=crJ, varJ=varJ), _, _, _, _)
       equation
         // get state names
@@ -3002,11 +3002,10 @@ algorithm
 
         //generate Jacobian name
         name = "StateSetJac" + intString(System.tmpTickIndex(Global.backendDAE_jacobianSeq));
-
         // generate generic Jacobian back end dae
         (jacobian, shared) = getSymbolicJacobian(diffVars, cEqns, resVars, oEqns, oVars, inShared, allvars, name, false);
 
-      then (BackendDAE.STATESET(rang, state, crA, varA, statescandidates, ovars, eqns, oeqns, crJ, varJ, jacobian), shared);
+      then (BackendDAE.STATESET(index, rang, state, crA, varA, statescandidates, ovars, eqns, oeqns, crJ, varJ, jacobian), shared);
   end match;
 end calculateStateSetJacobian;