Changeset 10462 for branches/HeuristicLab.EvolutionTracking/HeuristicLab.Problems.DataAnalysis.Symbolic

Timestamp:

02/19/14 08:25:37 (11 years ago)

Author:

bburlacu

Message:

#1772: Fixed bug in configuration of the tracking operators, fixed null reference exception when trying to access fragments in SymbolicDataAnalysisGenealogyGraphView

File:

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

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

@@ -356 +356 @@
       // add tracking analyzer
       foreach (var op in operators.OfType<SymbolicDataAnalysisGenealogyAnalyzer>()) {
-        //        op.BeforeCrossoverOperator = new SymbolicDataAnalysisExpressionBeforeCrossoverOperator();
-        //        op.AfterCrossoverOperator = new SymbolicDataAnalysisExpressionAfterCrossoverOperator();
-        op.BeforeCrossoverOperator = new BeforeCrossoverOperator<ISymbolicExpressionTree>();
-        op.AfterCrossoverOperator = new AfterCrossoverOperator<ISymbolicExpressionTree>();
+        op.BeforeCrossoverOperator = new SymbolicDataAnalysisExpressionBeforeCrossoverOperator();
+        op.AfterCrossoverOperator = new SymbolicDataAnalysisExpressionAfterCrossoverOperator();
         op.BeforeManipulatorOperator = new BeforeManipulatorOperator<ISymbolicExpressionTree>();
         op.AfterManipulatorOperator = new AfterManipulatorOperator<ISymbolicExpressionTree>();
@@ -373 +371 @@
           op.ManipulatorChildParameterName = manipulator.SymbolicExpressionTreeParameter.Name;
         }
-        op.PopulationParameter.ActualName = SolutionCreator.SymbolicExpressionTreeParameter.ActualName;
+        var creator = operators.OfType<ISymbolicExpressionTreeCreator>().FirstOrDefault();
+        if (creator != null) {
+          op.PopulationParameter.ActualName = creator.SymbolicExpressionTreeParameter.ActualName;
+        }
       }
     }