Changeset 15883 for branches/2886_SymRegGrammarEnumeration/HeuristicLab.Algorithms.DataAnalysis.SymRegGrammarEnumeration/GrammarEnumeration/SearchDataStructure.cs

Timestamp:

04/04/18 16:23:55 (7 years ago)

Author:

lkammere

Message:

#2886: Priorize phrases whose (fully expanded) terms result in high R².

File:

• branches/2886_SymRegGrammarEnumeration/HeuristicLab.Algorithms.DataAnalysis.SymRegGrammarEnumeration/GrammarEnumeration/SearchDataStructure.cs (modified) (7 diffs)

branches/2886_SymRegGrammarEnumeration/HeuristicLab.Algorithms.DataAnalysis.SymRegGrammarEnumeration/GrammarEnumeration/SearchDataStructure.cs

@@ -16 +16 @@
 
   public enum StorageType {
-    Stack, Queue, RandomList
+    PriorityQueue, Stack, Queue, RandomList
   }
 
@@ -22 +22 @@
 
     private Dictionary<int, SymbolString> storedValues; // Store hash-references and associated, actual values 
-    private Action<int> storeInternal; // Store hash-references 
+    private Action<int, double> storeInternal; // Store hash-references 
     private Func<int> fetchInternal; // Fetch hash-reference
 
@@ -29 +29 @@
 
       switch (storageType) {
+        case StorageType.PriorityQueue:
+          InitPriorityQueue();
+          break;
         case StorageType.Stack:
           InitStack();
@@ -44 +47 @@
     #region SearchStrategies
 
+    private void InitPriorityQueue() {
+      PriorityQueue<double, int> queue = new PriorityQueue<double, int>(double.MaxValue, double.MinValue, (int)Math.Pow(2.0, 20.0) / 4);
+      storeInternal = (hash, prio) => queue.Insert(prio, hash);
+      fetchInternal = () => {
+        int ret = queue.PeekMinValue();
+        queue.RemoveMin();
+        return ret;
+      };
+    }
+
     private void InitStack() {
       Stack<int> stack = new Stack<int>();
 
-      storeInternal = hash => stack.Push(hash);
+      storeInternal = (hash, prio) => stack.Push(hash);
       fetchInternal = () => stack.Pop();
     }
@@ -54 +67 @@
       Queue<int> queue = new Queue<int>();
 
-      storeInternal = hash => queue.Enqueue(hash);
+      storeInternal = (hash, prio) => queue.Enqueue(hash);
       fetchInternal = () => queue.Dequeue();
     }
@@ -62 +75 @@
       System.Random rand = new System.Random(999);
 
-      storeInternal = hash => list.Add(hash);
+      storeInternal = (hash, prio) => list.Add(hash);
       fetchInternal = () => {
         int indexOfHash = rand.Next(list.Count);
         int result = list[indexOfHash];
-        list.RemoveAt(indexOfHash);  // TODO: beware this is O(n), at some point in time we should fix this
+        list.RemoveAt(indexOfHash);  // TODO: beware this is O(n), at some point in time we should fix this. Maybe change to priority queue with random key.
         return result;
       };
@@ -82 +95 @@
     }
 
-    public void Store(int hash, SymbolString s) {
-      storeInternal(hash);
+    public void Store(int hash, double priority, SymbolString s) {
+      storeInternal(hash, priority);
       storedValues[hash] = s;
     }