Changeset 14353 for trunk/sources/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4

Timestamp:

10/23/16 19:31:18 (8 years ago)

Author:

bburlacu

Message:

#2685: Add correction step for values miscalculated due to cyclical symbol dependencies in the grammar. Updated unit test.

Location:

trunk/sources/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/TreeMatching

Files:

• SymbolicExpressionTreeBottomUpSimilarityCalculator.cs (modified) (2 diffs)
• SymbolicExpressionTreePhenotypicSimilarityCalculator.cs (modified) (1 diff)

trunk/sources/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/TreeMatching/SymbolicExpressionTreeBottomUpSimilarityCalculator.cs

@@ -61 +61 @@
     }
 
+    public static double CalculateBottomUpSimilarity(ISymbolicExpressionTree t1, ISymbolicExpressionTree t2) {
+      return new SymbolicExpressionTreeBottomUpSimilarityCalculator().CalculateSimilarity(t1, t2);
+    }
+
     public override double CalculateSolutionSimilarity(IScope leftSolution, IScope rightSolution) {
       if (leftSolution == rightSolution)
@@ -73 +77 @@
       var similarity = CalculateSimilarity(t1, t2);
       if (similarity > 1.0)
-        throw new Exception("Similarity value cannot be greater than 1");
+        throw new Exception("Similarity value " + similarity + " cannot be greater than 1");
 
       return similarity;

trunk/sources/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/TreeMatching/SymbolicExpressionTreePhenotypicSimilarityCalculator.cs

@@ -92 +92 @@
 
       var r2 = error == OnlineCalculatorError.None ? r * r : 0;
-
-      if (r2 > 1.0)
-        r2 = 1.0;
-
       return r2;
     }