- bugfix bootstrapping

- do not select discrete variables as tearing variables

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

Author: Jens Frenkel

Compiler/BackEnd/BackendDAEOptimize.mo

@@ -9042,7 +9042,7 @@ algorithm
         points = List.fold2(states, calcVarWights,mt,ass2,points);
         eqns = Matching.getUnassigned(arrayLength(m),ass2,{});
         points = List.fold2(eqns,addEqnWights,m,ass1,points);
-        //points = List.fold1(states,discriminateDiscrete,vars,points);
+        points = List.fold1(states,discriminateDiscrete,vars,points);
         //points = List.fold2(states,addOneEdgeEqnWights,(m,mt),ass1,points);
          Debug.fcall(Flags.TEARING_DUMP,  BackendDump.dumpMatching,points);
         tvar = selectVarWithMostPoints(states,points,-1,-1);

Compiler/BackEnd/IndexReduction.mo

@@ -2108,9 +2108,9 @@ algorithm
         // try again and add also stateSelect.always vars.
         nv = listLength(hov);
         true = intGt(neqns,nv);
-        (varlst,dummyStates,isyst,ishared,iSetIndex) = processComps2New(nv,hov,neqns,eqnslst,ilst,inComps,isyst,ishared,vec2,inArg,hov,inDummyStates,iSetIndex);
+        (outDummyVars,dummyStates,syst,shared,setIndex) = processComps2New(nv,hov,neqns,eqnslst,ilst,inComps,isyst,ishared,vec2,inArg,hov,inDummyStates,iSetIndex);
       then 
-        (varlst,dummyStates,isyst,ishared,iSetIndex);
+        (outDummyVars,dummyStates,syst,shared,setIndex);
   end matchcontinue;
 end processComps2New;
 
@@ -2168,7 +2168,7 @@ algorithm
         mT = BackendDAEUtil.transposeMatrix(m,inVarSize);
         Debug.fcall(Flags.BLT_DUMP, BackendDump.printEqSystem, BackendDAE.EQSYSTEM(vars,eqns,SOME(m),SOME(mT),BackendDAE.NO_MATCHING(),{}));
         // simplify the system
-
+         
         // do onefree matching
         vec1 = arrayCreate(inEqnsSize,-1);
         vec2 = arrayCreate(inVarSize,-1);