Context Navigation

Changeset 10096

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

Files:

-                      r9789
+                      r10096
 #endregion
+using HeuristicLab.Analysis.SolutionCaching.RealVectorEncoding;
 using HeuristicLab.Common;
 using HeuristicLab.Core;
 …
   [Item("TFAfterCrossoverCombinedOperator", "An operator that contains all operators that need to be executed after crossover for test functions.")]
   [StorableClass]
   public class TFAfterCrossoverCombinedOperator : AfterCrossoverCombinedOperator {
+  public class TFAfterCrossoverCombinedOperator : AfterCrossoverCombinedOperator, IRealVectorAdvice {
     [StorableConstructor]

-                      r10091
+                      r10096
     <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" />
 …
     <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" />

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

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

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

Note: See TracChangeset for help on using the changeset viewer.