Changeset 4237 for branches/DataAnalysis

Timestamp:

08/17/10 08:07:31 (14 years ago)

Author:

gkronber

Message:

Adapted loading of test cases. #1026

File:

• branches/DataAnalysis/HeuristicLab.Problems.DataAnalysis/3.3/Tests/SymbolicSimplifierTest.cs (modified) (3 diffs)

branches/DataAnalysis/HeuristicLab.Problems.DataAnalysis/3.3/Tests/SymbolicSimplifierTest.cs

@@ -51 +51 @@
 
       {
-        SymbolicRegressionSolution solution = LoadSolution("RegressionSolution01.hl"); 
+        SymbolicRegressionSolution solution = LoadSolution("RegressionSolution01.hl");
         SymbolicRegressionSolution simplifiedSolution = SimplifySolution(solution);
         AssertEqualEnumerations(solution.EstimatedValues, simplifiedSolution.EstimatedValues);
@@ -83 +83 @@
 
     private SymbolicRegressionSolution LoadSolution(string fileName) {
-      var result = (Result)ContentManager.Load(fileName);
-      return (SymbolicRegressionSolution)result.Value;
+      var doc = ContentManager.Load(fileName);
+      Result result = doc as Result;
+      if (result != null) {
+        return (SymbolicRegressionSolution)result.Value;
+      }
+      SymbolicRegressionSolution solution = doc as SymbolicRegressionSolution;
+      if (solution != null) {
+        return solution;
+      }
+      Assert.Fail("Cannot load file " + fileName);
+      throw new AssertFailedException();
     }
 
@@ -103 +112 @@
       var actualEnumerator = actual.GetEnumerator();
       while (expectedEnumerator.MoveNext() & actualEnumerator.MoveNext()) {
-        Assert.AreEqual(expectedEnumerator.Current, actualEnumerator.Current, 1E-6 * expectedEnumerator.Current);
+        Assert.AreEqual(expectedEnumerator.Current, actualEnumerator.Current, Math.Abs(1E-6 * expectedEnumerator.Current));
       }
       if (expectedEnumerator.MoveNext() | actualEnumerator.MoveNext())