Changeset 10285 for branches/HeuristicLab.EvolutionTracking/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4

Timestamp:

01/05/14 20:47:50 (11 years ago)

Author:

bburlacu

Message:

#1772: Added SymbolicDataAnalysisGenealogyView, updated generic analyzer and operators.

Location:

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

Files:

• SymbolicDataAnalysisProblem.cs (modified) (1 diff)
• SymbolicDataAnalysisSingleObjectiveProblem.cs (modified) (2 diffs)

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

@@ -358 +358 @@
       // add tracking analyzer
       foreach (var op in operators.OfType<GenealogyAnalyzer<TGraph, TVertex, ISymbolicExpressionTree>>()) {
+        // get crossover parameter names
         var crossover = operators.OfType<ISymbolicExpressionTreeCrossover>().First();
         op.CrossoverParentsParameterName = crossover.ParentsParameter.Name;
         op.CrossoverChildParameterName = crossover.ChildParameter.Name;
+        // get munipulator parameter names
         var manipulator = operators.OfType<ISymbolicExpressionTreeManipulator>().First();
         op.ManipulatorChildParameterName = manipulator.SymbolicExpressionTreeParameter.Name;
-        var creator = operators.OfType<ISymbolicExpressionTreeCreator>().First();
-        op.SolutionCreatorIndividualParameterName = creator.SymbolicExpressionTreeParameter.Name;
       }
     }

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

@@ -25 +25 @@
 using HeuristicLab.Core;
 using HeuristicLab.Data;
+using HeuristicLab.Encodings.SymbolicExpressionTreeEncoding;
+using HeuristicLab.EvolutionTracking;
 using HeuristicLab.Optimization;
 using HeuristicLab.Parameters;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
+
+using TGraph = HeuristicLab.EvolutionTracking.IGenealogyGraph<HeuristicLab.EvolutionTracking.GenealogyGraphNode<HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.ISymbolicExpressionTree>,
+                                                              HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.ISymbolicExpressionTree>;
+using TVertex = HeuristicLab.EvolutionTracking.GenealogyGraphNode<HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.ISymbolicExpressionTree>;
 
 namespace HeuristicLab.Problems.DataAnalysis.Symbolic {
@@ -115 +121 @@
         op.MaximizationParameter.ActualName = MaximizationParameterName;
       }
+
+      foreach (var op in Operators.OfType<GenealogyAnalyzer<TGraph, TVertex, ISymbolicExpressionTree>>()) {
+        op.QualityParameter.ActualName = Evaluator.QualityParameter.ActualName;
+        op.PopulationParameter.ActualName = Evaluator.SymbolicExpressionTreeParameter.ActualName;
+      }
     }
   }