Changeset 12068

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.

Location:

branches/SymbolicExpressionTreeDiversityAnalyzers

Files:

• HeuristicLab.Problems.DataAnalysis.Symbolic.Classification/3.4/SingleObjective/SymbolicClassificationSingleObjectiveProblem.cs (modified) (2 diffs)
• HeuristicLab.Problems.DataAnalysis.Symbolic.Regression/3.4/SingleObjective/SymbolicRegressionSingleObjectiveProblem.cs (modified) (2 diffs)
• HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/SymbolicDataAnalysisProblem.cs (modified) (2 diffs)
• HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/TreeMatching/SymbolicExpressionTreePhenotypicSimilarityCalculator.cs (modified) (3 diffs)
• SymbolicExpressionTreeDiversityAnalyzers.v12.suo (modified) (previous)

branches/SymbolicExpressionTreeDiversityAnalyzers/HeuristicLab.Problems.DataAnalysis.Symbolic.Classification/3.4/SingleObjective/SymbolicClassificationSingleObjectiveProblem.cs

@@ -116 +116 @@
       Operators.Add(new SymbolicClassificationSingleObjectiveValidationParetoBestSolutionAnalyzer());
       Operators.Add(new SymbolicClassificationPhenotypicDiversityAnalyzer());
+      Operators.Add(new SymbolicExpressionTreePhenotypicSimilarityCalculator());
       ParameterizeOperators();
     }
@@ -147 +148 @@
       }
 
+      foreach (var op in Operators.OfType<SymbolicExpressionTreePhenotypicSimilarityCalculator>()) {
+        op.SolutionVariableName = SolutionCreator.SymbolicExpressionTreeParameter.ActualName;
+        op.ProblemData = ProblemData;
+        op.Interpreter = SymbolicExpressionTreeInterpreter;
+      }
+
       foreach (var op in Operators.OfType<SymbolicClassificationPhenotypicDiversityAnalyzer>()) {
-        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;
       }
     }

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;
       }
     }

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

@@ -229 +229 @@
       Operators.Add(new SymbolicExpressionTreeLengthAnalyzer());
       Operators.Add(new SymbolicDataAnalysisBottomUpDiversityAnalyzer());
+      Operators.Add(new SymbolicExpressionTreeBottomUpSimilarityCalculator());
       ParameterizeOperators();
     }
@@ -348 +349 @@
         op.EvaluatorParameter.ActualName = EvaluatorParameter.Name;
       }
+      foreach (var op in operators.OfType<SymbolicExpressionTreeBottomUpSimilarityCalculator>()) {
+        op.SolutionVariableName = SolutionCreator.SymbolicExpressionTreeParameter.ActualName;
+      }
       foreach (var op in operators.OfType<SymbolicDataAnalysisBottomUpDiversityAnalyzer>()) {
-        var sim = op.SimilarityCalculator as SymbolicExpressionTreeBottomUpSimilarityCalculator;
-        if (sim == null) {
-          op.SimilarityCalculator = new SymbolicExpressionTreeBottomUpSimilarityCalculator {
-            SolutionVariableName = SolutionCreator.SymbolicExpressionTreeParameter.ActualName
-          };
-        } else {
-          sim.SolutionVariableName = SolutionCreator.SymbolicExpressionTreeParameter.ActualName;
-        }
+        var sim = Operators.OfType<SymbolicExpressionTreeBottomUpSimilarityCalculator>().FirstOrDefault();
+        if (sim != null)
+          op.SimilarityCalculator = sim;
       }
     }

branches/SymbolicExpressionTreeDiversityAnalyzers/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/TreeMatching/SymbolicExpressionTreePhenotypicSimilarityCalculator.cs

@@ -20 +20 @@
 #endregion
 
+using System;
 using HeuristicLab.Common;
 using HeuristicLab.Core;
@@ -53 +54 @@
 
     public double CalculateSimilarity(ISymbolicExpressionTree t1, ISymbolicExpressionTree t2) {
+      if (Interpreter == null || ProblemData == null)
+        throw new InvalidOperationException("Cannot calculate phenotypic similarity when no interpreter or problem data were set.");
+
       var v1 = Interpreter.GetSymbolicExpressionTreeValues(t1, ProblemData.Dataset, ProblemData.TrainingIndices);
       var v2 = Interpreter.GetSymbolicExpressionTreeValues(t2, ProblemData.Dataset, ProblemData.TrainingIndices);
+
+      if (v1.Variance().IsAlmost(0) && v2.Variance().IsAlmost(0))
+        return 1.0;
 
       OnlineCalculatorError error;
@@ -68 +75 @@
       if (leftSolution == rightSolution)
         return 1.0;
+
+      if (!leftSolution.Variables.ContainsKey("EstimatedValues") || !rightSolution.Variables.ContainsKey("EstimatedValues"))
+        throw new ArgumentException("No estimated values are present in the subscopes.");
 
       var leftValues = (DoubleArray)leftSolution.Variables["EstimatedValues"].Value;