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

Timestamp:

02/21/15 15:55:47 (9 years ago)

Author:

bburlacu

Message:

#2326: Addressed the issues found by the reviewer.

Location:

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

Files:

• SymbolicRegressionPhenotypicDiversityAnalyzer.cs (modified) (1 diff)
• SymbolicRegressionSingleObjectiveProblem.cs (modified) (3 diffs)

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

@@ -29 +29 @@
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 
-namespace HeuristicLab.Problems.DataAnalysis.Symbolic.Analyzers {
+namespace HeuristicLab.Problems.DataAnalysis.Symbolic.Regression {
   [Item("SymbolicRegressionPhenotypicDiversityAnalyzer", "An analyzer which calculates diversity based on the phenotypic distance between trees")]
   [StorableClass]

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

@@ -25 +25 @@
 using HeuristicLab.Parameters;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
-using HeuristicLab.Problems.DataAnalysis.Symbolic.Analyzers;
 
 namespace HeuristicLab.Problems.DataAnalysis.Symbolic.Regression {
@@ -113 +112 @@
       Operators.Add(new SymbolicRegressionSolutionsAnalyzer());
       Operators.Add(new SymbolicRegressionPhenotypicDiversityAnalyzer());
-
       ParameterizeOperators();
     }
@@ -143 +141 @@
         }
       }
+      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;
+        }
+      }
     }
   }