Changeset 1a8d2923 in OpenModelica

Timestamp:

2021-04-15T09:16:04+02:00 (3 years ago)

Author:

Karim Abdelhak <karim.abdelhak@…>

Parents:

549d184

git-author:

Karim Abdelhak <karim.abdelhak@…> (04/14/21 14:49:18)

git-committer:

Karim Abdelhak <karim.abdelhak@…> (04/15/21 09:16:04)

Message:

[BE] better information handling and fix MSSS ASSC

File:

• OMCompiler/Compiler/BackEnd/Matching.mo (modified) (3 diffs)

OMCompiler/Compiler/BackEnd/Matching.mo

@@ -5637 +5637 @@
         syst := isyst;
 
-        /* check if index type is solvable and is unprocessed and if index reduction is activated */
-        if (not Flags.getConfigBool(Flags.NO_ASSC)) and BackendDAEUtil.hasIndexTypeSolvableAndUnprocessedScalar(syst) and BackendDAEUtil.doIndexReduction(inMatchingOptions) then
-          /* set the system to processed so that it gets analyzed only once */
-          syst := BackendDAEUtil.setAnalyticalToStructuralProcessed(syst, true);
-
-          // ###### PHASE I:
-          //  analyze the structural singular subset for additional
-          //  analytical singularities and apply ASSC
-          unmatched_eqs := getUnassigned(ne, ass1_1, {});
-          meqns1 := getEqnsforIndexReduction(unmatched_eqs,ne,m,mt,ass1_1,ass2_1,inArg);
-
-          for set in meqns1 loop
-            (ass1_1, ass2_1, syst, changed) := BackendDAEUtil.analyticalToStructuralSingularity(set, ass1_1, ass2_1, syst, changed, true);
-          end for;
-
-          // ###### PHASE II:
-          //  analyze the strong components for
-          //  analytical singularities and apply ASSC
-          (_, m1, _, _, _) := BackendDAEUtil.getAdjacencyMatrixScalar(isyst, BackendDAE.NORMAL(), NONE(), BackendDAEUtil.isInitializationDAE(ishared));
-          comps := Sorting.Tarjan(m1, ass2_1);
-
-          for comp in comps loop
-            (ass1_1, ass2_1, syst, changed) := BackendDAEUtil.analyticalToStructuralSingularity(comp, ass1_1, ass2_1, syst, changed, false);
-          end for;
-
-          /* only do matching again if anything has changed */
-          if changed then
-            BackendDAEEXT.setAssignment(nv,ne,ass1_1,ass2_1);
-            BackendDAE.EQSYSTEM(m=SOME(m),mT=SOME(mt)) := syst;
-            matchingExternalsetAdjacencyMatrix(nv,ne,m);
-            /* Call with clearMatching = 0 to reuse old information */
-            BackendDAEEXT.matching(nv,ne,algIndx,cheapMatching,1.0,0);
-            BackendDAEEXT.getAssignment(ass1_1,ass2_1);
-          end if;
-        end if;
 
         /* get unmatched equations for index reduction */
         unmatched_eqs := getUnassigned(ne, ass1_1, {});
-
-        if Flags.isSet(Flags.BLT_DUMP) and Flags.isSet(Flags.GRAPHML) then BackendDump.dumpBipartiteGraphEqSystem(isyst, ishared, "BeforMatching_"+intString(arrayLength(m))+"_unmatched "+intString(listLength(unmatched_eqs))); end if;
-        if Flags.isSet(Flags.BLT_DUMP) and listLength(unmatched_eqs) > 0 then print("unmatched equations: "+stringDelimitList(List.map(unmatched_eqs,intString),", ")+"\n\n"); end if;
 
         /*
@@ -5691 +5653 @@
 
         meqns1 := getEqnsforIndexReduction(unmatched_eqs,ne,m1,m1t,ass1_1,ass2_1,inArg);
+
+        /* check if index type is solvable and is unprocessed and if index reduction is activated */
+        if (not Flags.getConfigBool(Flags.NO_ASSC)) and BackendDAEUtil.hasIndexTypeSolvableAndUnprocessedScalar(syst) and BackendDAEUtil.doIndexReduction(inMatchingOptions) then
+          /* set the system to processed so that it gets analyzed only once */
+          syst := BackendDAEUtil.setAnalyticalToStructuralProcessed(syst, true);
+
+          // ###### PHASE I ASSC:
+          //  analyze the structural singular subset for additional
+          //  analytical singularities and apply ASSC
+          for set in meqns1 loop
+            (ass1_1, ass2_1, syst, changed) := BackendDAEUtil.analyticalToStructuralSingularity(set, ass1_1, ass2_1, syst, changed, true);
+          end for;
+
+          // ###### PHASE II ASSC:
+          //  analyze the strong components for
+          //  analytical singularities and apply ASSC
+          (_, m1, _, _, _) := BackendDAEUtil.getAdjacencyMatrixScalar(isyst, BackendDAE.NORMAL(), NONE(), BackendDAEUtil.isInitializationDAE(ishared));
+          comps := Sorting.Tarjan(m1, ass2_1);
+
+          for comp in comps loop
+            (ass1_1, ass2_1, syst, changed) := BackendDAEUtil.analyticalToStructuralSingularity(comp, ass1_1, ass2_1, syst, changed, false);
+          end for;
+
+          /* only do matching again if anything has changed */
+          if changed then
+            BackendDAEEXT.setAssignment(nv,ne,ass1_1,ass2_1);
+            BackendDAE.EQSYSTEM(m=SOME(m),mT=SOME(mt)) := syst;
+            matchingExternalsetAdjacencyMatrix(nv,ne,m);
+            /* Call with clearMatching = 0 to reuse old information */
+            BackendDAEEXT.matching(nv,ne,algIndx,cheapMatching,1.0,0);
+            BackendDAEEXT.getAssignment(ass1_1,ass2_1);
+
+            // recompute MSSS
+            unmatched_eqs := getUnassigned(ne, ass1_1, {});
+            m1 := arrayCopy(m);
+            m1t := arrayCopy(mt);
+            (m1,m1t) := removeEdgesForNoDerivativeFunctionInputs(m1,m1t,syst,ishared);
+            (m1,m1t) := removeEdgesToDiscreteEquations(m1,m1t,syst,ishared);
+            meqns1 := getEqnsforIndexReduction(unmatched_eqs,ne,m1,m1t,ass1_1,ass2_1,inArg);
+          end if;
+        end if;
+
+        if Flags.isSet(Flags.BLT_DUMP) and Flags.isSet(Flags.GRAPHML) then BackendDump.dumpBipartiteGraphEqSystem(isyst, ishared, "BeforMatching_"+intString(arrayLength(m))+"_unmatched "+intString(listLength(unmatched_eqs))); end if;
+        if Flags.isSet(Flags.BLT_DUMP) and listLength(unmatched_eqs) > 0 then print("unmatched equations: "+stringDelimitList(List.map(unmatched_eqs,intString),", ")+"\n\n"); end if;
+
         /*
           -----------------------------------------
@@ -5707 +5714 @@
         end if;
 
-        //Debug information
-          //if listLength(List.flatten(meqns1)) >= 5 then meqs_short = List.firstN(List.flatten(meqns1),5); else meqs_short = List.flatten(meqns1); end if;
-          //BackendDump.dumpBipartiteGraphEqSystem(isyst,ishared,"MSSS_"+stringDelimitList(List.map(meqs_short,intString),"_"));
         (ass1_1,ass2_1,syst,shared,arg) := matchingExternal(meqns1,true,algIndx,-1,0,syst,ishared,nv,ne,ass1_1,ass2_1,inMatchingOptions,sssHandler,inArg);
       then