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

Timestamp:

07/11/18 10:34:21 (6 years ago)

Author:

bburlacu

Message:

#2886: refactor code

File:

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

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

@@ -52 +52 @@
   class SearchDataStore : DeepCloneable, IEnumerable<SearchNode> {
     [Storable]
-    private LruCache<int, SearchNode> storedValues;
-    //private Dictionary<int, SearchNode> storedValues; // Store hash-references and associated, actual values 
+    private Dictionary<int, SearchNode> storedValues; // Store hash-references and associated, actual values 
 
     [Storable]
@@ -72 +71 @@
     [Storable]
     private int searchDataStructureSize; // storage size for search nodes 
-
-    [Storable]
-    private int cacheSize; // cache for already explored search nodes 
 
     [ExcludeFromObjectGraphTraversal]
@@ -87 +83 @@
     protected SearchDataStore(bool deserializing) : this() { }
 
-    public SearchDataStore(StorageType storageType, int searchDataStructureSize = (int)1e5, int cacheSize = (int)1e5) {
+    public SearchDataStore(StorageType storageType, int searchDataStructureSize = (int)1e5) {
       this.storageType = storageType;
 
       this.searchDataStructureSize = searchDataStructureSize;
-      this.cacheSize = cacheSize;
-
-      storedValues = new LruCache<int, SearchNode>(this.cacheSize);
+
+      storedValues = new Dictionary<int, SearchNode>();
       InitSearchDataStructure();
     }
@@ -142 +137 @@
 
     protected SearchDataStore(SearchDataStore original, Cloner cloner) : base(original, cloner) {
-      storedValues = cloner.Clone(original.storedValues);
+      storedValues = original.storedValues.ToDictionary(x => x.Key, x => cloner.Clone(x.Value));
       storageType = original.storageType;
-      cacheSize = original.cacheSize;
       searchDataStructureSize = original.searchDataStructureSize;
 
@@ -204 +198 @@
               var max = sortedSet.Max;
               sortedSet.Remove(max);
-              storedValues.Remove(max.Item2);
+              storedValues.Remove(max.Item2); // should always be in sync with the sorted set
             }
             sortedSet.Add(Tuple.Create(prio, hash));
@@ -211 +205 @@
             var elem = sortedSet.FirstOrDefault();
             if (elem == null)
-              return 0;
+              return default(int);
             sortedSet.Remove(elem);
             return elem.Item2;
@@ -226 +220 @@
         // size is the 0-based index of the last used element
         if (priorityQueue.Size == capacity - 1) {
-          // if the queue is at capacity we have to replace 
-          return;
+          return; // if the queue is at capacity we have to return 
         }
         priorityQueue.Insert(prio, hash);