Changeset 11b8174 in OpenModelica

Timestamp:

2020-10-21T15:27:25+02:00 (4 years ago)

Author:

Adrian Pop <adrian.pop@…>

Children:

51a52b92

Parents:

db67367

git-author:

Per Östlund <perost86@…> (09/30/20 16:39:24)

git-committer:

Adrian Pop <adrian.pop@…> (10/21/20 15:27:25)

Message:

Update UnorderedSet.

• Fix size of the set when removing elements with UnorderedSet.remove.
• Add functions copy, first, all, any, none and isEmpty.

File:

• OMCompiler/Compiler/Util/UnorderedSet.mo (modified) (8 diffs)

OMCompiler/Compiler/Util/UnorderedSet.mo

@@ -67 +67 @@
     "Creates a new set given a hash function, equality function, and optional
      desired bucket count. An approriate bucket count is
-     Util.nextPrime(number of values that will be added), but starting with a
-     low bucket count is also fine if the number of values is unknown since the
+     Util.nextPrime(number of elements that will be added), but starting with a
+     low bucket count is also fine if the number of elements is unknown since the
      set rehashes as needed."
     input Hash hash;
@@ -80 +80 @@
     set := UNORDERED_SET(buckets, Mutable.create(0), hash, keyEq);
   end new;
+
+  function copy
+    "Returns a copy of the given set."
+    input UnorderedSet<T> set;
+    output UnorderedSet<T> outSet;
+  algorithm
+    outSet := UNORDERED_SET(
+      Mutable.create(arrayCopy(Mutable.access(set.buckets))),
+      Mutable.create(Mutable.access(set.size)),
+      set.hashFn,
+      set.eqFn
+    );
+  end copy;
 
   function add
@@ -145 +158 @@
     if isSome(okey) then
       arrayUpdateNoBoundsChecking(buckets, hash + 1, bucket);
+      Mutable.update(set.size, Mutable.access(set.size) - 1);
     end if;
   end remove;
@@ -206 +220 @@
 
   function toList
-    "Returns the values in the set as a list in no particular order."
+    "Returns the elements in the set as a list in no particular order."
     input UnorderedSet<T> set;
     output list<T> outList = {};
@@ -218 +232 @@
 
   function toArray
-    "Returns the values in the set as an array in no particular order."
+    "Returns the elements in the set as an array in no particular order."
     input UnorderedSet<T> set;
     output array<T> outArray;
@@ -254 +268 @@
   end fold;
 
+  function all
+    "Returns true if the given function returns true for all elements in the set,
+     otherwise false."
+    input UnorderedSet<T> set;
+    input PredFn fn;
+    output Boolean res;
+
+    partial function PredFn
+      input T key;
+      output Boolean res;
+    end PredFn;
+  algorithm
+    if isEmpty(set) then
+      res := true;
+      return;
+    end if;
+
+    for b in Mutable.access(set.buckets) loop
+      for k in b loop
+        if not fn(k) then
+          res := false;
+          return;
+        end if;
+      end for;
+    end for;
+
+    res := true;
+  end all;
+
+  function any
+    "Returns true if the given function returns true for any elements in the set,
+     otherwise false."
+    input UnorderedSet<T> set;
+    input PredFn fn;
+    output Boolean res;
+
+    partial function PredFn
+      input T key;
+      output Boolean res;
+    end PredFn;
+  algorithm
+    if isEmpty(set) then
+      res := false;
+      return;
+    end if;
+
+    for b in Mutable.access(set.buckets) loop
+      for k in b loop
+        if fn(k) then
+          res := true;
+          return;
+        end if;
+      end for;
+    end for;
+
+    res := false;
+  end any;
+
+  function none
+    "Returns true if the given function returns true for none of the elements in
+     the set, otherwise false."
+    input UnorderedSet<T> set;
+    input PredFn fn;
+    output Boolean res;
+
+    partial function PredFn
+      input T key;
+      output Boolean res;
+    end PredFn;
+  algorithm
+    if isEmpty(set) then
+      res := true;
+      return;
+    end if;
+
+    for b in Mutable.access(set.buckets) loop
+      for k in b loop
+        if fn(k) then
+          res := false;
+          return;
+        end if;
+      end for;
+    end for;
+
+    res := true;
+  end none;
+
   function size
-    "Returns the number of values the set contains."
+    "Returns the number of elements the set contains."
     input UnorderedSet<T> set;
     output Integer size = Mutable.access(set.size);
   end size;
+
+  function isEmpty
+    "Returns whether the set is empty or not."
+    input UnorderedSet<T> set;
+    output Boolean empty = Mutable.access(set.size) == 0;
+  end isEmpty;
 
   function bucketCount
@@ -275 +382 @@
   function rehash
     "Changes the number of buckets to an appropriate number based on the number
-     of values in the set and rehashes all the keys."
+     of elements in the set and rehashes all the keys."
     input UnorderedSet<T> set;
   protected
@@ -378 +485 @@
     end if;
 
-    // Add the key and its index in the value array to the bucket indicated by the hash.
+    // Add the key to the bucket indicated by the hash.
     arrayUpdate(buckets, h + 1, key :: arrayGet(buckets, h + 1));
     // Update the size of the set.