Changeset 6502


Ignore:
Timestamp:
07/04/11 14:52:21 (8 years ago)
Author:
gkronber
Message:

#1567 changed GP unit tests and reverted changeset 6r499

Location:
trunk/sources
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/sources/HeuristicLab 3.3.sln

    r6499 r6502  
    14471447    {66DABFD5-5BD2-4478-8DF9-C589F569F7A2}.Debug|x86.ActiveCfg = Debug|x86
    14481448    {66DABFD5-5BD2-4478-8DF9-C589F569F7A2}.Debug|x86.Build.0 = Debug|x86
    1449     {66DABFD5-5BD2-4478-8DF9-C589F569F7A2}.Release|Any CPU.ActiveCfg = Release|x86
    1450     {66DABFD5-5BD2-4478-8DF9-C589F569F7A2}.Release|Any CPU.Build.0 = Release|x86
     1449    {66DABFD5-5BD2-4478-8DF9-C589F569F7A2}.Release|Any CPU.ActiveCfg = Release|Any CPU
     1450    {66DABFD5-5BD2-4478-8DF9-C589F569F7A2}.Release|Any CPU.Build.0 = Release|Any CPU
    14511451    {66DABFD5-5BD2-4478-8DF9-C589F569F7A2}.Release|x64.ActiveCfg = Release|x64
    14521452    {66DABFD5-5BD2-4478-8DF9-C589F569F7A2}.Release|x64.Build.0 = Release|x64
  • trunk/sources/HeuristicLab/3.3/Tests/SamplesTest.cs

    r6477 r6502  
    176176      ga.SetSeedRandomly.Value = false;
    177177      RunAlgorithm(ga);
    178       Assert.AreEqual(89, GetDoubleResult(ga, "BestQuality"));
    179       Assert.AreEqual(68.635, GetDoubleResult(ga, "CurrentAverageQuality"));
    180       Assert.AreEqual(0, GetDoubleResult(ga, "CurrentWorstQuality"));
    181       Assert.AreEqual(50950, GetIntResult(ga, "EvaluatedSolutions"));
     178      if (!Environment.Is64BitProcess) {
     179        Assert.AreEqual(89, GetDoubleResult(ga, "BestQuality"));
     180        Assert.AreEqual(68.635, GetDoubleResult(ga, "CurrentAverageQuality"));
     181        Assert.AreEqual(0, GetDoubleResult(ga, "CurrentWorstQuality"));
     182        Assert.AreEqual(50950, GetIntResult(ga, "EvaluatedSolutions"));
     183      } else {
     184        Assert.AreEqual(82, GetDoubleResult(ga, "BestQuality"));
     185        Assert.AreEqual(65.594, GetDoubleResult(ga, "CurrentAverageQuality"));
     186        Assert.AreEqual(0, GetDoubleResult(ga, "CurrentWorstQuality"));
     187        Assert.AreEqual(50950, GetIntResult(ga, "EvaluatedSolutions"));
     188      }
    182189    }
    183190
     
    228235      ga.SetSeedRandomly.Value = false;
    229236      RunAlgorithm(ga);
    230       Assert.AreEqual(0.82895806566669916, GetDoubleResult(ga, "BestQuality"));
    231       Assert.AreEqual(0.50808259256341926, GetDoubleResult(ga, "CurrentAverageQuality"));
    232       Assert.AreEqual(0, GetDoubleResult(ga, "CurrentWorstQuality"));
    233       Assert.AreEqual(50950, GetIntResult(ga, "EvaluatedSolutions"));
     237      if (!Environment.Is64BitProcess) {
     238        Assert.AreEqual(0.82895806566669916, GetDoubleResult(ga, "BestQuality"));
     239        Assert.AreEqual(0.50808259256341926, GetDoubleResult(ga, "CurrentAverageQuality"));
     240        Assert.AreEqual(0, GetDoubleResult(ga, "CurrentWorstQuality"));
     241        Assert.AreEqual(50950, GetIntResult(ga, "EvaluatedSolutions"));
     242      } else {
     243        Assert.AreEqual(0.80376816256837447, GetDoubleResult(ga, "BestQuality"));
     244        Assert.AreEqual(0.56912229251001056, GetDoubleResult(ga, "CurrentAverageQuality"));
     245        Assert.AreEqual(0, GetDoubleResult(ga, "CurrentWorstQuality"));
     246        Assert.AreEqual(50950, GetIntResult(ga, "EvaluatedSolutions"));
     247      }
    234248    }
    235249
     
    344358      ga.SetSeedRandomly.Value = false;
    345359      RunAlgorithm(ga);
    346       Assert.AreEqual(0.13607488888377872, GetDoubleResult(ga, "BestQuality"));
    347       Assert.AreEqual(2.1634701155600293, GetDoubleResult(ga, "CurrentAverageQuality"));
    348       Assert.AreEqual(100.62175156249987, GetDoubleResult(ga, "CurrentWorstQuality"));
    349       Assert.AreEqual(100900, GetIntResult(ga, "EvaluatedSolutions"));
     360      if (!Environment.Is64BitProcess) {
     361        Assert.AreEqual(0.13607488888377872, GetDoubleResult(ga, "BestQuality"));
     362        Assert.AreEqual(2.1634701155600293, GetDoubleResult(ga, "CurrentAverageQuality"));
     363        Assert.AreEqual(100.62175156249987, GetDoubleResult(ga, "CurrentWorstQuality"));
     364        Assert.AreEqual(100900, GetIntResult(ga, "EvaluatedSolutions"));
     365      } else {
     366        Assert.AreEqual(0.1343874434023121, GetDoubleResult(ga, "BestQuality"));
     367        Assert.AreEqual(5.1125971846526053, GetDoubleResult(ga, "CurrentAverageQuality"));
     368        Assert.AreEqual(100.62175156249987, GetDoubleResult(ga, "CurrentWorstQuality"));
     369        Assert.AreEqual(100900, GetIntResult(ga, "EvaluatedSolutions"));
     370      }
    350371    }
    351372
Note: See TracChangeset for help on using the changeset viewer.