Changeset 11534 for stable

Timestamp:

11/11/14 12:33:18 (10 years ago)

Author:

mkommend

Message:

#2144: Merged r11430 into stable.

Location:

stable

Files:

• . (modified) (1 prop)
• HeuristicLab.Tests (modified) (1 prop)
• HeuristicLab.Tests/HeuristicLab.Problems.DataAnalysis.Symbolic-3.4/SymbolicDataAnalysisExpressionTreeInterpreterTest.cs (modified) (2 diffs)
• HeuristicLab.Tests/HeuristicLab.Problems.DataAnalysis.Symbolic.TimeSeriesPrognosis-3.4/SymbolicDataAnalysisExpressionTreeInterpreterTest.cs (modified) (1 diff)

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

@@ -339 +339 @@
       Evaluate(interpreter, ds, "(xor 1.0 2.0 3.0)", 0, 1.0);
       Evaluate(interpreter, ds, "(xor (log -1.0))", 0, -1.0);
-      Evaluate(interpreter, ds, "(xor (log -1.0)  1.0)", 0, 1.0); 
+      Evaluate(interpreter, ds, "(xor (log -1.0)  1.0)", 0, 1.0);
 
       // sin, cos, tan
@@ -478 +478 @@
       Assert.IsFalse(double.IsNaN(actual) && !double.IsNaN(expected));
       Assert.IsFalse(!double.IsNaN(actual) && double.IsNaN(expected));
-      Assert.AreEqual(expected, actual, 1.0E-12, expr);
+      if (!double.IsNaN(actual) && !double.IsNaN(expected))
+        Assert.AreEqual(expected, actual, 1.0E-12, expr);
     }
   }

stable/HeuristicLab.Tests/HeuristicLab.Problems.DataAnalysis.Symbolic.TimeSeriesPrognosis-3.4/SymbolicDataAnalysisExpressionTreeInterpreterTest.cs

@@ -338 +338 @@
       Assert.IsFalse(double.IsNaN(actual) && !double.IsNaN(expected));
       Assert.IsFalse(!double.IsNaN(actual) && double.IsNaN(expected));
-      Assert.AreEqual(expected, actual, 1.0E-12, expr);
+      if (!double.IsNaN(actual) && !double.IsNaN(expected))
+        Assert.AreEqual(expected, actual, 1.0E-12, expr);
     }
   }