Changeset 13182 for stable

Timestamp:

11/16/15 17:41:55 (9 years ago)

Author:

mkommend

Message:

#2453: Merged r12839 into stable.

Location:

stable

Files:

• . (modified) (1 prop)
• HeuristicLab.Problems.DataAnalysis.Symbolic (modified) (1 prop)
• HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/TreeMatching/SymbolicExpressionTreePhenotypicSimilarityCalculator.cs (modified) (2 diffs)

stable/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/TreeMatching/SymbolicExpressionTreePhenotypicSimilarityCalculator.cs

@@ -67 +67 @@
       var r = OnlinePearsonsRCalculator.Calculate(v1, v2, out error);
 
-      if (r > 1.0)
-        r = 1.0;
+      var r2 = error == OnlineCalculatorError.None ? r * r : 0;
 
-      return error == OnlineCalculatorError.None ? r*r : 0;
+      if (r2 > 1.0)
+        r2 = 1.0;
+
+      return r2;
     }
 
@@ -89 +91 @@
       var r = OnlinePearsonsRCalculator.Calculate(leftValues, rightValues, out error);
 
-      if (r > 1.0)
-        r = 1.0; // sometimes due to fp errors it can happen that the correlation is over 1 (like 1.0000000009)
+      var r2 = error == OnlineCalculatorError.None ? r * r : 0;
 
-      return error == OnlineCalculatorError.None ? r*r : 0;
+      if (r2 > 1.0)
+        r2 = 1.0;
+
+      return r2;
     }
   }