Changeset 12163

Timestamp:

03/09/15 15:06:49 (9 years ago)

Author:

bburlacu

Message:

#1772: Split EvolutionTrackingAnalyzer into generic and non-generic class. Added SelectionSchemeAnalyzer.

Location:

branches/HeuristicLab.EvolutionTracking

Files:

• HeuristicLab.EvolutionTracking/3.4/Analyzers/EvolutionTrackingAnalyzer.cs (modified) (5 diffs)
• HeuristicLab.EvolutionTracking/3.4/Analyzers/SelectionSchemeAnalyzer.cs (added)
• HeuristicLab.EvolutionTracking/3.4/HeuristicLab.EvolutionTracking-3.4.csproj (modified) (1 diff)
• HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/HeuristicLab.Problems.DataAnalysis.Symbolic-3.4.csproj (modified) (1 diff)

branches/HeuristicLab.EvolutionTracking/HeuristicLab.EvolutionTracking/3.4/Analyzers/EvolutionTrackingAnalyzer.cs

@@ -31 +31 @@
   [Item("EvolutionTrackingAnalyzer", "Base class for analyzers that use the genealogy graph")]
   [StorableClass]
-  public abstract class EvolutionTrackingAnalyzer<T> : SingleSuccessorOperator, IAnalyzer where T : class,IItem {
+  public abstract class EvolutionTrackingAnalyzer : SingleSuccessorOperator, IAnalyzer {
     #region parameter names
     private const string GenerationsParameterName = "Generations";
     private const string ResultsParameterName = "Results";
     private const string PopulationSizeParameterName = "PopulationSize";
-    private const string PopulationGraphResultName = "PopulationGraph";
+    protected const string PopulationGraphResultName = "PopulationGraph";
     #endregion
 
@@ -64 +64 @@
     public IntValue Generation { get { return GenerationsParameter.ActualValue; } }
     public IntValue PopulationSize { get { return PopulationSizeParameter.ActualValue; } }
-    public IGenealogyGraph<T> PopulationGraph {
+    public IGenealogyGraph PopulationGraph {
       get {
         if (Results.ContainsKey(PopulationGraphResultName))
-          return (IGenealogyGraph<T>)Results[PopulationGraphResultName].Value;
+          return (IGenealogyGraph)Results[PopulationGraphResultName].Value;
         return null;
       }
@@ -79 +79 @@
 
     protected EvolutionTrackingAnalyzer() {
-      Parameters.Add(new LookupParameter<IGenealogyGraph<T>>(PopulationGraphResultName, "The genealogy graph."));
+      Parameters.Add(new LookupParameter<IGenealogyGraph>(PopulationGraphResultName, "The genealogy graph."));
       Parameters.Add(new LookupParameter<IntValue>(GenerationsParameterName, "The number of generations."));
       Parameters.Add(new LookupParameter<ResultCollection>(ResultsParameterName, "The results collection."));
@@ -87 +87 @@
     }
 
-    protected EvolutionTrackingAnalyzer(EvolutionTrackingAnalyzer<T> original, Cloner cloner)
+    protected EvolutionTrackingAnalyzer(EvolutionTrackingAnalyzer original, Cloner cloner)
       : base(original, cloner) {
     }
@@ -94 +94 @@
     protected EvolutionTrackingAnalyzer(bool deserializing) : base(deserializing) { }
   }
+
+  [Item("EvolutionTrackingAnalyzer", "Base class for analyzers that use the genealogy graph")]
+  [StorableClass]
+  public class EvolutionTrackingAnalyzer<T> : EvolutionTrackingAnalyzer where T : class, IItem {
+    public EvolutionTrackingAnalyzer() { }
+
+    protected EvolutionTrackingAnalyzer(EvolutionTrackingAnalyzer original, Cloner cloner) : base(original, cloner) { }
+
+    public override IDeepCloneable Clone(Cloner cloner) {
+      return new EvolutionTrackingAnalyzer<T>(this, cloner);
+    }
+
+    [StorableConstructor]
+    protected EvolutionTrackingAnalyzer(bool deserializing) : base(deserializing) { }
+
+    new public IGenealogyGraph<T> PopulationGraph {
+      get {
+        if (Results.ContainsKey(PopulationGraphResultName))
+          return (IGenealogyGraph<T>)Results[PopulationGraphResultName].Value;
+        return null;
+      }
+    }
+  }
 }

branches/HeuristicLab.EvolutionTracking/HeuristicLab.EvolutionTracking/3.4/HeuristicLab.EvolutionTracking-3.4.csproj

@@ -112 +112 @@
     <Compile Include="Analyzers\EvolutionTrackingAnalyzer.cs" />
     <Compile Include="Analyzers\GenealogyAnalyzer.cs" />
+    <Compile Include="Analyzers\SelectionSchemeAnalyzer.cs" />
     <Compile Include="Collections\CloneableCollection.cs" />
     <Compile Include="Fragment.cs" />

branches/HeuristicLab.EvolutionTracking/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/HeuristicLab.Problems.DataAnalysis.Symbolic-3.4.csproj

@@ -307 +307 @@
     <Compile Include="Symbols\VariableConditionTreeNode.cs" />
     <Compile Include="Symbols\VariableTreeNode.cs" />
+    <Compile Include="Tracking\Analyzers\SymbolicDataAnalysisFragmentLengthAnalyzer.cs" />
+    <Compile Include="Tracking\Analyzers\SymbolicDataAnalysisTraceOverlapAnalyzer.cs" />
     <Compile Include="Tracking\SymbolicDataAnalysisExpressionAfterCrossoverOperator.cs" />
     <Compile Include="Tracking\SymbolicDataAnalysisExpressionAfterManipulatorOperator.cs" />