Use difference instead of intersection (#13720)

Author: phannebohm

OMCompiler/Compiler/BackEnd/EvaluateFunctions.mo

@@ -3165,7 +3165,6 @@ algorithm
          if Flags.isSet(Flags.EVAL_FUNC_DUMP) then
            print("--> the predicted const outputs:\n"+stringDelimitList(List.map(outExps,ExpressionDump.printExpStr),"\n"));
          end if;
-         (_,_,_) = List.intersection1OnTrue(outExps,allLHS,Expression.expEqual);
 
          //_ = (not listEmpty(constOutExps)) and listEmpty(varOutExps);
          //repl = bcallret3(not predicted, BackendVarTransform.removeReplacements,replIn,varCrefs,NONE(),replIn);

OMCompiler/Compiler/BackEnd/Matching.mo

@@ -61,6 +61,7 @@ import IndexReduction;
 import Inline;
 import List;
 import MetaModelica.Dangerous;
+import UnorderedSet;
 import Util;
 import Sorting;
 import System;
@@ -5892,14 +5893,14 @@ algorithm
       //update m
       for e in eqIdxs loop
         row := m[e];
-        (_,row,_) := List.intersection1OnTrue(row,varIdxs,intEq);
+        row := UnorderedSet.difference_list(row, varIdxs, Util.id, intEq);
         arrayUpdate(m,e,row);
-        //update mt
-        for varIdx in varIdxs loop
-          row := arrayGet(mt,varIdx);
-          row := List.deleteMemberOnTrue(e, row, intEq);
-          arrayUpdate(mt,varIdx,row);
-        end for;
+      end for;
+      //update mt
+      for varIdx in varIdxs loop
+        row := mt[varIdx];
+        row := UnorderedSet.difference_list(row, eqIdxs, Util.id, intEq);
+        arrayUpdate(mt,varIdx,row);
       end for;
     end if;
     idx := idx+1;
@@ -5937,7 +5938,7 @@ algorithm
         //print("remove edges between eq: "+intString(idx)+" and vars "+stringDelimitList(List.map(varIdxs,intString),", ")+"\n");
       //update m
       row := m[idx];
-      (_,row,_) := List.intersection1OnTrue(row,varIdxs,intEq);
+      row := UnorderedSet.difference_list(row,varIdxs,Util.id,intEq);
       arrayUpdate(m,idx,row);
       //update mt
       for varIdx in varIdxs loop

OMCompiler/Compiler/Util/UnorderedSet.mo

@@ -703,6 +703,38 @@ public
     set := fromList(acc, hashFunc, keyEqFunc);
   end intersection_list;
 
+  function difference_list
+    "lst1 / lst2, assuming unique lists"
+    input list<T> inList1;
+    input list<T> inList2;
+    input Hash hashFunc;
+    input KeyEq keyEqFunc;
+    output list<T> acc = {};
+  protected
+    UnorderedSet<T> set2;
+    list<T> lst1 = inList1, lst2 = inList2;
+  algorithm
+    // remove common start, since this seems to be very common
+    while not (listEmpty(lst1) or listEmpty(lst2)) and keyEqFunc(listHead(lst1), listHead(lst2)) loop
+      lst1 := listRest(lst1);
+      lst2 := listRest(lst2);
+    end while;
+
+    // {} - B = {}
+    // A - {} = A
+    if listEmpty(lst1) or listEmpty(lst2) then
+      acc := lst1;
+      return;
+    end if;
+
+    set2 := fromList(lst2, hashFunc, keyEqFunc);
+    for k in lst1 loop
+      if not contains(k, set2) then
+        acc := k :: acc;
+      end if;
+    end for;
+  end difference_list;
+
   function difference
     "set1 / set2"
     input UnorderedSet<T> set1;