Changeset 12068 for branches/SymbolicExpressionTreeDiversityAnalyzers/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression/3.4/SingleObjective

Timestamp:

02/24/15 17:07:41 (10 years ago)

Author:

bburlacu

Message:

#2326: Fixed mistakes and wired similarity calculators directly into the problem and correctly initialized the properties of the phenotypic similarity calculator.

File:

• branches/SymbolicExpressionTreeDiversityAnalyzers/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression/3.4/SingleObjective/SymbolicRegressionSingleObjectiveProblem.cs (modified) (2 diffs)

branches/SymbolicExpressionTreeDiversityAnalyzers/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression/3.4/SingleObjective/SymbolicRegressionSingleObjectiveProblem.cs

@@ -112 +112 @@
       Operators.Add(new SymbolicRegressionSolutionsAnalyzer());
       Operators.Add(new SymbolicRegressionPhenotypicDiversityAnalyzer());
+      Operators.Add(new SymbolicExpressionTreePhenotypicSimilarityCalculator());
       ParameterizeOperators();
     }
@@ -141 +142 @@
         }
       }
+
+      foreach (var op in Operators.OfType<SymbolicExpressionTreePhenotypicSimilarityCalculator>()) {
+        op.SolutionVariableName = SolutionCreator.SymbolicExpressionTreeParameter.ActualName;
+        op.ProblemData = ProblemData;
+        op.Interpreter = SymbolicExpressionTreeInterpreter;
+      }
+
       foreach (var op in Operators.OfType<SymbolicRegressionPhenotypicDiversityAnalyzer>()) {
-        var sim = op.SimilarityCalculator as SymbolicExpressionTreePhenotypicSimilarityCalculator;
-        if (sim == null) {
-          op.SimilarityCalculator = new SymbolicExpressionTreePhenotypicSimilarityCalculator {
-            SolutionVariableName = SolutionCreator.SymbolicExpressionTreeParameter.ActualName
-          };
-        } else {
-          sim.SolutionVariableName = SolutionCreator.SymbolicExpressionTreeParameter.ActualName;
-        }
+        var sim = Operators.OfType<SymbolicExpressionTreePhenotypicSimilarityCalculator>().FirstOrDefault();
+        if (sim != null)
+          op.SimilarityCalculator = sim;
       }
     }