Changeset 17950

Timestamp:

04/19/21 11:02:22 (4 years ago)

Author:

gkronber

Message:

#3117: fixed comparison of values in InterpreterConsistencyTests (again). The latest fail was for v1 == v2 == 0 which should be fixed now.

File:

• trunk/HeuristicLab.Tests/HeuristicLab.Problems.DataAnalysis.Symbolic-3.4/SymbolicDataAnalysisExpressionTreeInterpreterTest.cs (modified) (2 diffs)

trunk/HeuristicLab.Tests/HeuristicLab.Problems.DataAnalysis.Symbolic-3.4/SymbolicDataAnalysisExpressionTreeInterpreterTest.cs

@@ -321 +321 @@
               var v2 = valuesMatrix[n][row];
               if (double.IsNaN(v1) && double.IsNaN(v2)) continue;
-              if (Math.Abs(1.0 - v1 / v2) >= delta) {
+              if (v1 != v2 && Math.Abs(1.0 - v1 / v2) >= delta) {
                 Console.WriteLine(formatter.Format(tree));
                 foreach (var node in tree.Root.GetSubtree(0).GetSubtree(0).IterateNodesPrefix().ToList()) {
@@ -349 +349 @@
               }
               string errorMessage = string.Format("Interpreters {0} and {1} do not agree on tree {2} and row {3} (seed = {4}).", interpreters[m].Name, interpreters[n].Name, i, row, seed);
-              Assert.IsTrue(double.IsPositiveInfinity(v1) && double.IsPositiveInfinity(v2) ||
-                            double.IsNaN(v1) && double.IsNaN(v2) ||
-                            double.IsNegativeInfinity(v1) && double.IsNegativeInfinity(v2) ||
+              Assert.IsTrue(double.IsNaN(v1) && double.IsNaN(v2) ||
+                            v1 == v2 || // in particular 0 = 0
                             Math.Abs(1.0 - v1 / v2) < delta, errorMessage);
             }