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

Timestamp:

10/04/13 17:24:46 (11 years ago)

Author:

ascheibe

Message:

#1886

• removed old caching code
• adapted convex hull view and some other minor improvements

Location:

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

Files:

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

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

@@ -21 +21 @@
 
 using System.Collections.Generic;
+using HeuristicLab.Common;
 using HeuristicLab.Encodings.RealVectorEncoding;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
@@ -35 +36 @@
     public override bool Equals(RealVector x, RealVector y) {
       for (int i = 0; i < x.Length; i++) {
-        if (x[i] != y[i]) return false;
+        if (!x[i].IsAlmost(y[i])) return false;
       }
       return true;

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

@@ -21 +21 @@
 
 using System.Collections.Generic;
+using System.Linq;
 using HeuristicLab.Common;
 using HeuristicLab.Core;
@@ -32 +33 @@
   public abstract class SolutionCache<TKey, TValue> : Item
     where TKey : Item
-    where TValue : Item {
+    where TValue : SolutionInformation<TKey> {
 
     [Storable]
@@ -83 +84 @@
       return solutionDictionary.Count;
     }
+
+    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>();
+    }
   }
 }