Changeset 12395 for branches/HiveStatistics/sources/HeuristicLab.Tests/HeuristicLab.Problems.DataAnalysis.Symbolic-3.4/SymbolicDataAnalysisExpressionTreeInterpreterTest.cs

Timestamp:

05/20/15 16:41:14 (10 years ago)

Author:

dglaser

Message:

#2388 merged trunk into hive statistics branch

Location:

branches/HiveStatistics/sources

Files:

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

branches/HiveStatistics/sources/HeuristicLab.Tests/HeuristicLab.Problems.DataAnalysis.Symbolic-3.4/SymbolicDataAnalysisExpressionTreeInterpreterTest.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.
@@ -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);
     }
   }