Changeset 10104 for branches/HeuristicLab.Analysis.AlgorithmBehavior/HeuristicLab.Analysis.SolutionCaching

Timestamp:

11/04/13 10:18:18 (11 years ago)

Author:

ascheibe

Message:

#1886 fixed RealVectorEqualityComparer and added unit tests for caches

Location:

branches/HeuristicLab.Analysis.AlgorithmBehavior/HeuristicLab.Analysis.SolutionCaching/3.3

Files:

• RealVectorEncoding/RealVectorEqualityComparer.cs (modified) (1 diff)
• SolutionCache.cs (modified) (2 diffs)

branches/HeuristicLab.Analysis.AlgorithmBehavior/HeuristicLab.Analysis.SolutionCaching/3.3/RealVectorEncoding/RealVectorEqualityComparer.cs

@@ -42 +42 @@
 
     public override int GetHashCode(RealVector obj) {
-      //compute FNV hash
-      int h = 216613626;
-
-      for (int i = 0; i < obj.Length; i++) {
-        h = (h * 16777619) ^ obj[i].GetHashCode();
+      unchecked {
+        int hash = 17;
+        for (int i = 0; i < obj.Length; i++) {
+          hash = hash * 23 + obj[i].GetHashCode();
+        }
+        return hash;
       }
-      return h;
     }
   }

branches/HeuristicLab.Analysis.AlgorithmBehavior/HeuristicLab.Analysis.SolutionCaching/3.3/SolutionCache.cs

@@ -28 +28 @@
 
 namespace HeuristicLab.Analysis.SolutionCaching {
+  //TODO: should implement a collection interface
   [Item("SolutionCache", "Stores solutions generated by an algorithm.")]
   [StorableClass]
@@ -88 +89 @@
     }
 
+    public virtual IEnumerable<TKey> Keys() {
+      return solutionDictionary.Keys;
+    }
+
+    public virtual IEnumerable<List<TValue>> Values() {
+      return solutionDictionary.Values;
+    }
+
     public virtual List<TKey> GetSolutionsFromGeneration(int generation) {
       return solutionDictionary.Where(x => x.Value.Count(y => y.Generation == generation) != 0).Select(x => x.Key).ToList<TKey>();