[NB] Use UnorderedSet to make list unique (#11344)

* [NB] Use UnorderedSet to make list unique `List.unique` is O(N^2) while `UnorderedSet.unique_list` is O(N).
OpenModelica · Oct 6, 2023 · 0c3d54d · 0c3d54d
1 parent bf2b968
commit 0c3d54d
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 3 deletions.
diff --git a/OMCompiler/Compiler/NBackEnd/Modules/1_Main/NBResolveSingularities.mo b/OMCompiler/Compiler/NBackEnd/Modules/1_Main/NBResolveSingularities.mo
@@ -100,6 +100,7 @@ public
   extends Module.resolveSingularitiesInterface;
     input list<list<Integer>> marked_eqns_lst;
   protected
+    UnorderedSet<Integer> marked_eqns_set;
     list<Integer> marked_eqns;
     SlicingStatus status;
     Pointer<Equation> constraint, sliced_eqn, diffed_eqn;
@@ -118,7 +119,14 @@ public
   algorithm
     if not listEmpty(marked_eqns_lst) then
       changed := true;
-      marked_eqns := List.unique(List.flatten(marked_eqns_lst));
+      // marked_eqns_lst to flat uniqie list (via UnorderedSet)
+      marked_eqns_set := UnorderedSet.new(Util.id, intEq, Util.nextPrime(sum(listLength(l) for l in marked_eqns_lst)));
+      for lst in marked_eqns_lst loop
+        for e in lst loop
+          UnorderedSet.add(e, marked_eqns_set);
+        end for;
+      end for;
+      marked_eqns := UnorderedSet.toList(marked_eqns_set);
       // --------------------------------------------------------
       //      1. BASIC INDEX REDUCTION
       // --------------------------------------------------------

diff --git a/OMCompiler/Compiler/NBackEnd/Util/NBSlice.mo b/OMCompiler/Compiler/NBackEnd/Util/NBSlice.mo
@@ -332,7 +332,7 @@ public
 
     // sort
     for i in 1:arrayLength(indices) loop
-      indices[i] := List.sort(List.unique(indices[i]), intLt);
+      indices[i] := List.sort(UnorderedSet.unique_list(indices[i], Util.id, intEq), intLt);
     end for;
   end getDependentCrefIndicesPseudoArray;
 
@@ -390,7 +390,7 @@ public
 
     // sort
     for i in 1:arrayLength(indices) loop
-      indices[i] := List.sort(List.unique(indices[i]), intLt);
+      indices[i] := List.sort(UnorderedSet.unique_list(indices[i], Util.id, intEq), intLt);
     end for;
   end getDependentCrefIndicesPseudoFor;