Changeset 11928

Timestamp:

02/06/15 02:43:43 (10 years ago)

Author:

bburlacu

Message:

#1772: Added missing clone method to Fragment<T>, changed storable constructor access modifier to protected.

Location:

branches/HeuristicLab.EvolutionTracking

Files:

• HeuristicLab.EvolutionTracking/3.4/Fragment.cs (modified) (2 diffs)
• HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/SymbolicDataAnalysisProblem.cs (modified) (2 diffs)

branches/HeuristicLab.EvolutionTracking/HeuristicLab.EvolutionTracking/3.4/Fragment.cs

@@ -28 +28 @@
       Index2 = original.Index2;
     }
+
     public override IDeepCloneable Clone(Cloner cloner) {
       return new Fragment(this, cloner);
     }
+
     public Fragment() { }
   }
@@ -42 +44 @@
     }
 
-    protected Fragment(Fragment original, Cloner cloner)
+    public override IDeepCloneable Clone(Cloner cloner) {
+      return new Fragment<T>(this, cloner);
+    }
+
+    protected Fragment(Fragment<T> original, Cloner cloner)
       : base(original, cloner) {
     }
 
     [StorableConstructor]
-    private Fragment(bool deserializable) : base(deserializable) { }
+    protected Fragment(bool deserializable) : base(deserializable) { }
 
     public Fragment() { }

branches/HeuristicLab.EvolutionTracking/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/SymbolicDataAnalysisProblem.cs

@@ -235 +235 @@
       Operators.Add(new SymbolicExpressionTreeLengthAnalyzer());
       Operators.Add(new SingleObjectivePopulationDiversityAnalyzer());
+      Operators.Add(new SymbolicDataAnalysisPhenotypicDiversityAnalyzer());
+      Operators.Add(new SymbolicDataAnalysisBottomUpDiversityAnalyzer());
+      Operators.Add(new SymbolicDataAnalysisGenealogyAnalyzer());
       ParameterizeOperators();
     }
@@ -361 +364 @@
         op.SimilarityCalculator = new SymbolicExpressionTreeBottomUpSimilarityCalculator();
       }
+      // add tracking analyzer
+      foreach (var op in operators.OfType<SymbolicDataAnalysisGenealogyAnalyzer>()) {
+        op.BeforeCrossoverOperatorParameter.ActualValue = new SymbolicDataAnalysisExpressionBeforeCrossoverOperator();
+        op.AfterCrossoverOperatorParameter.ActualValue = new SymbolicDataAnalysisExpressionAfterCrossoverOperator();
+        op.BeforeManipulatorOperatorParameter.ActualValue = new SymbolicDataAnalysisExpressionBeforeManipulatorOperator();
+        op.AfterManipulatorOperatorParameter.ActualValue = new SymbolicDataAnalysisExpressionAfterManipulatorOperator();
+        // get crossover parameter names
+        var crossover = operators.OfType<ISymbolicExpressionTreeCrossover>().FirstOrDefault();
+        if (crossover != null) {
+          op.BeforeCrossoverOperator.ParentsParameter.ActualName = crossover.ParentsParameter.Name;
+          op.AfterCrossoverOperator.ParentsParameter.ActualName = crossover.ParentsParameter.Name;
+          op.BeforeCrossoverOperator.ChildParameter.ActualName = crossover.ChildParameter.Name;
+          op.AfterCrossoverOperator.ChildParameter.ActualName = crossover.ChildParameter.Name;
+        }
+        // get manipulator parameter names
+        var manipulator = operators.OfType<ISymbolicExpressionTreeManipulator>().FirstOrDefault();
+        if (manipulator != null) {
+          op.BeforeManipulatorOperator.ChildParameter.ActualName = manipulator.SymbolicExpressionTreeParameter.Name;
+          op.AfterManipulatorOperator.ChildParameter.ActualName = manipulator.SymbolicExpressionTreeParameter.Name;
+        }
+        var creator = operators.OfType<ISymbolicExpressionTreeCreator>().FirstOrDefault();
+        if (creator != null) {
+          op.PopulationParameter.ActualName = creator.SymbolicExpressionTreeParameter.ActualName;
+        }
+      }
     }