Changeset 12049 for branches/SymbolicExpressionTreeDiversityAnalyzers/HeuristicLab.Problems.DataAnalysis.Symbolic/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/3.4

Files:

• SymbolicDataAnalysisProblem.cs (modified) (4 diffs)
• TreeMatching/SymbolicExpressionTreeBottomUpSimilarityCalculator.cs (modified) (1 diff)
• TreeMatching/SymbolicExpressionTreePhenotypicSimilarityCalculator.cs (modified) (2 diffs)

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

@@ -119 +119 @@
       set { ProblemDataParameter.Value = value; }
     }
-
     public ISymbolicDataAnalysisGrammar SymbolicExpressionTreeGrammar {
       get { return SymbolicExpressionTreeGrammarParameter.Value; }
@@ -128 +127 @@
       set { SymbolicExpressionTreeInterpreterParameter.Value = value; }
     }
-
     public IntValue MaximumSymbolicExpressionTreeDepth {
       get { return MaximumSymbolicExpressionTreeDepthParameter.Value; }
@@ -144 +142 @@
       get { return RelativeNumberOfEvaluatedSamplesParameter.Value; }
     }
-
     public IntRange FitnessCalculationPartition {
       get { return FitnessCalculationPartitionParameter.Value; }
@@ -352 +349 @@
         op.EvaluatorParameter.ActualName = EvaluatorParameter.Name;
       }
+      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;
+        }
+      }
     }
 

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

@@ -60 +60 @@
 
     public override double CalculateSolutionSimilarity(IScope leftSolution, IScope rightSolution) {
+      if (leftSolution == rightSolution)
+        return 1.0;
+
       var t1 = leftSolution.Variables[SolutionVariableName].Value as ISymbolicExpressionTree;
       var t2 = rightSolution.Variables[SolutionVariableName].Value as ISymbolicExpressionTree;

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

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.
@@ -63 +63 @@
 
     public override double CalculateSolutionSimilarity(IScope leftSolution, IScope rightSolution) {
+      if (leftSolution == rightSolution)
+        return 1.0;
+
       var leftValues = (DoubleArray)leftSolution.Variables["EstimatedValues"].Value;
       var rightValues = (DoubleArray)rightSolution.Variables["EstimatedValues"].Value;