Changeset 6502 for trunk

Timestamp:

07/04/11 14:52:21 (13 years ago)

Author:

gkronber

Message:

#1567 changed GP unit tests and reverted changeset 6r499

Location:

trunk/sources

Files:

• HeuristicLab 3.3.sln (modified) (1 diff)
• HeuristicLab/3.3/Tests/SamplesTest.cs (modified) (3 diffs)

trunk/sources/HeuristicLab 3.3.sln

@@ -1447 +1447 @@
     {66DABFD5-5BD2-4478-8DF9-C589F569F7A2}.Debug|x86.ActiveCfg = Debug|x86
     {66DABFD5-5BD2-4478-8DF9-C589F569F7A2}.Debug|x86.Build.0 = Debug|x86
-    {66DABFD5-5BD2-4478-8DF9-C589F569F7A2}.Release|Any CPU.ActiveCfg = Release|x86
-    {66DABFD5-5BD2-4478-8DF9-C589F569F7A2}.Release|Any CPU.Build.0 = Release|x86
+    {66DABFD5-5BD2-4478-8DF9-C589F569F7A2}.Release|Any CPU.ActiveCfg = Release|Any CPU
+    {66DABFD5-5BD2-4478-8DF9-C589F569F7A2}.Release|Any CPU.Build.0 = Release|Any CPU
     {66DABFD5-5BD2-4478-8DF9-C589F569F7A2}.Release|x64.ActiveCfg = Release|x64
     {66DABFD5-5BD2-4478-8DF9-C589F569F7A2}.Release|x64.Build.0 = Release|x64

trunk/sources/HeuristicLab/3.3/Tests/SamplesTest.cs

@@ -176 +176 @@
       ga.SetSeedRandomly.Value = false;
       RunAlgorithm(ga);
-      Assert.AreEqual(89, GetDoubleResult(ga, "BestQuality"));
-      Assert.AreEqual(68.635, GetDoubleResult(ga, "CurrentAverageQuality"));
-      Assert.AreEqual(0, GetDoubleResult(ga, "CurrentWorstQuality"));
-      Assert.AreEqual(50950, GetIntResult(ga, "EvaluatedSolutions"));
+      if (!Environment.Is64BitProcess) {
+        Assert.AreEqual(89, GetDoubleResult(ga, "BestQuality"));
+        Assert.AreEqual(68.635, GetDoubleResult(ga, "CurrentAverageQuality"));
+        Assert.AreEqual(0, GetDoubleResult(ga, "CurrentWorstQuality"));
+        Assert.AreEqual(50950, GetIntResult(ga, "EvaluatedSolutions"));
+      } else {
+        Assert.AreEqual(82, GetDoubleResult(ga, "BestQuality"));
+        Assert.AreEqual(65.594, GetDoubleResult(ga, "CurrentAverageQuality"));
+        Assert.AreEqual(0, GetDoubleResult(ga, "CurrentWorstQuality"));
+        Assert.AreEqual(50950, GetIntResult(ga, "EvaluatedSolutions"));
+      }
     }
 
@@ -228 +235 @@
       ga.SetSeedRandomly.Value = false;
       RunAlgorithm(ga);
-      Assert.AreEqual(0.82895806566669916, GetDoubleResult(ga, "BestQuality"));
-      Assert.AreEqual(0.50808259256341926, GetDoubleResult(ga, "CurrentAverageQuality"));
-      Assert.AreEqual(0, GetDoubleResult(ga, "CurrentWorstQuality"));
-      Assert.AreEqual(50950, GetIntResult(ga, "EvaluatedSolutions"));
+      if (!Environment.Is64BitProcess) {
+        Assert.AreEqual(0.82895806566669916, GetDoubleResult(ga, "BestQuality"));
+        Assert.AreEqual(0.50808259256341926, GetDoubleResult(ga, "CurrentAverageQuality"));
+        Assert.AreEqual(0, GetDoubleResult(ga, "CurrentWorstQuality"));
+        Assert.AreEqual(50950, GetIntResult(ga, "EvaluatedSolutions"));
+      } else {
+        Assert.AreEqual(0.80376816256837447, GetDoubleResult(ga, "BestQuality"));
+        Assert.AreEqual(0.56912229251001056, GetDoubleResult(ga, "CurrentAverageQuality"));
+        Assert.AreEqual(0, GetDoubleResult(ga, "CurrentWorstQuality"));
+        Assert.AreEqual(50950, GetIntResult(ga, "EvaluatedSolutions"));
+      }
     }
 
@@ -344 +358 @@
       ga.SetSeedRandomly.Value = false;
       RunAlgorithm(ga);
-      Assert.AreEqual(0.13607488888377872, GetDoubleResult(ga, "BestQuality"));
-      Assert.AreEqual(2.1634701155600293, GetDoubleResult(ga, "CurrentAverageQuality"));
-      Assert.AreEqual(100.62175156249987, GetDoubleResult(ga, "CurrentWorstQuality"));
-      Assert.AreEqual(100900, GetIntResult(ga, "EvaluatedSolutions"));
+      if (!Environment.Is64BitProcess) {
+        Assert.AreEqual(0.13607488888377872, GetDoubleResult(ga, "BestQuality"));
+        Assert.AreEqual(2.1634701155600293, GetDoubleResult(ga, "CurrentAverageQuality"));
+        Assert.AreEqual(100.62175156249987, GetDoubleResult(ga, "CurrentWorstQuality"));
+        Assert.AreEqual(100900, GetIntResult(ga, "EvaluatedSolutions"));
+      } else {
+        Assert.AreEqual(0.1343874434023121, GetDoubleResult(ga, "BestQuality"));
+        Assert.AreEqual(5.1125971846526053, GetDoubleResult(ga, "CurrentAverageQuality"));
+        Assert.AreEqual(100.62175156249987, GetDoubleResult(ga, "CurrentWorstQuality"));
+        Assert.AreEqual(100900, GetIntResult(ga, "EvaluatedSolutions"));
+      }
     }