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

Timestamp:

10/30/13 17:05:39 (11 years ago)

Author:

ascheibe

Message:

#1886 started working on crossover wrappers that can execute analyzers for crossovers

Location:

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

Files:

• HeuristicLab.Analysis.SolutionCaching-3.3.csproj (modified) (2 diffs)
• IAdvice.cs (added)
• IPointcut.cs (added)
• PermutationEncoding/PermutationSolutionInformation.cs (modified) (2 diffs)
• RealVectorEncoding/IRealVectorAdvice.cs (added)
• RealVectorEncoding/IRealVectorPointcut.cs (added)
• RealVectorEncoding/RealVectorCrossoverPointcut.cs (added)
• RealVectorEncoding/RealVectorSolutionInformation.cs (modified) (2 diffs)
• SolutionInformation.cs (modified) (5 diffs)

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

@@ -127 +127 @@
     <Compile Include="Algorithm\SolutionCacheAnalyzerAlgorithm.cs" />
     <Compile Include="Algorithm\ParallelOperatorProcessor.cs" />
+    <Compile Include="IAdvice.cs" />
+    <Compile Include="IPointcut.cs" />
     <Compile Include="ISolutionCache.cs" />
     <Compile Include="PermutationEncoding\PermutationSolutionCache.cs" />
@@ -133 +135 @@
     <Compile Include="Plugin.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="RealVectorEncoding\IRealVectorAdvice.cs" />
+    <Compile Include="RealVectorEncoding\IRealVectorPointcut.cs" />
+    <Compile Include="RealVectorEncoding\RealVectorCrossoverPointcut.cs" />
     <Compile Include="RealVectorEncoding\RealVectorEqualityComparer.cs" />
     <Compile Include="RealVectorEncoding\RealVectorSolutionCache.cs" />

branches/HeuristicLab.Analysis.AlgorithmBehavior/HeuristicLab.Analysis.SolutionCaching/3.3/PermutationEncoding/PermutationSolutionInformation.cs

@@ -20 +20 @@
 #endregion
 
-using System.Collections.Generic;
 using HeuristicLab.Common;
 using HeuristicLab.Core;
@@ -30 +29 @@
   [StorableClass]
   public class PermutationSolutionInformation : SolutionInformation<Encodings.PermutationEncoding.Permutation> {
-    public PermutationSolutionInformation() {
-      ParentList = new List<Permutation>();
-    }
+    public PermutationSolutionInformation() : base() { }
     [StorableConstructor]
     protected PermutationSolutionInformation(bool deserializing) : base(deserializing) { }

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

@@ -20 +20 @@
 #endregion
 
-using System.Collections.Generic;
 using HeuristicLab.Common;
 using HeuristicLab.Core;
-using HeuristicLab.Encodings.RealVectorEncoding;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 
@@ -30 +28 @@
   [StorableClass]
   public class RealVectorSolutionInformation : SolutionInformation<Encodings.RealVectorEncoding.RealVector> {
-    public RealVectorSolutionInformation() {
-      ParentList = new List<RealVector>();
-    }
+    public RealVectorSolutionInformation() : base() { }
     [StorableConstructor]
     protected RealVectorSolutionInformation(bool deserializing) : base(deserializing) { }

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

@@ -23 +23 @@
 using HeuristicLab.Common;
 using HeuristicLab.Core;
+using HeuristicLab.Optimization;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 
@@ -37 +38 @@
     [Storable]
     public int Generation { get; set; }
+    [Storable]
+    public ResultCollection InfoStore { get; set; }
 
-    public SolutionInformation() { }
+    public SolutionInformation() {
+      ParentList = new List<T>();
+      InfoStore = new ResultCollection();
+    }
 
     [StorableConstructor]
@@ -47 +53 @@
       this.ParentList = new List<T>(original.ParentList);
       this.Generation = original.Generation;
+      this.InfoStore = (ResultCollection)original.InfoStore.Clone(cloner);
     }
 
@@ -66 +73 @@
           if (!pi.ParentList.Contains(p)) return false;
         }
+        foreach (IResult info in InfoStore) {
+          if (!pi.InfoStore.Contains(info)) return false;
+        }
         return true;
       } else {
@@ -71 +81 @@
       }
     }
+
+    public virtual void AddInfo(Result info) {
+      InfoStore.Add(info);
+    }
   }
 }