Changeset 12891 for branches/HeuristicLab.EvolutionTracking/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/SymbolicDataAnalysisProblem.cs

Timestamp:

08/22/15 14:27:37 (9 years ago)

Author:

bburlacu

Message:

#1772: Merge trunk changes. Remove dead code from the genealogy analyzer.

Location:

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

Files:

• . (modified) (1 prop)
• 3.4/SymbolicDataAnalysisProblem.cs (modified) (4 diffs)

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

@@ -300 +300 @@
 
     protected virtual void ParameterizeOperators() {
-      var operators = Parameters.OfType<IValueParameter>().Select(p => p.Value).OfType<IOperator>().Union(Operators).ToList();
+      var operators =
+        Parameters.OfType<IValueParameter>().Select(p => p.Value).OfType<IOperator>().Union(Operators).ToList();
 
       foreach (var op in operators.OfType<ISymbolicExpressionTreeGrammarBasedOperator>()) {
@@ -322 +323 @@
       foreach (var op in operators.OfType<ISymbolicExpressionTreeCrossover>()) {
         op.ParentsParameter.ActualName = SolutionCreator.SymbolicExpressionTreeParameter.ActualName;
-        op.ChildParameter.ActualName = SolutionCreator.SymbolicExpressionTreeParameter.ActualName;
+        op.SymbolicExpressionTreeParameter.ActualName = SolutionCreator.SymbolicExpressionTreeParameter.ActualName;
       }
       foreach (var op in operators.OfType<ISymbolicExpressionTreeManipulator>()) {
@@ -357 +358 @@
         op.BeforeCrossoverOperatorParameter.ActualValue = new SymbolicDataAnalysisExpressionBeforeCrossoverOperator();
         op.AfterCrossoverOperatorParameter.ActualValue = new SymbolicDataAnalysisExpressionAfterCrossoverOperator();
-        op.BeforeManipulatorOperatorParameter.ActualValue = new SymbolicDataAnalysisExpressionBeforeManipulatorOperator();
+        op.BeforeManipulatorOperatorParameter.ActualValue =
+          new SymbolicDataAnalysisExpressionBeforeManipulatorOperator();
         op.AfterManipulatorOperatorParameter.ActualValue = new SymbolicDataAnalysisExpressionAfterManipulatorOperator();
         // get crossover parameter names
@@ -364 +366 @@
           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;
+          op.BeforeCrossoverOperator.ChildParameter.ActualName = crossover.SymbolicExpressionTreeParameter.Name;
+          op.AfterCrossoverOperator.ChildParameter.ActualName = crossover.SymbolicExpressionTreeParameter.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;
+          }
         }
       }