Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
07/16/17 09:43:05 (7 years ago)
Author:
gkronber
Message:

#2802: merged r15235,15246,15247 from trunk to stable

Location:
stable
Files:
3 edited
1 copied

Legend:

Unmodified
Added
Removed
  • stable

  • stable/HeuristicLab.Tests

  • stable/HeuristicLab.Tests/HeuristicLab-3.3/Samples/GPSymbolicRegressionSampleWithOSTest.cs

    r15235 r15257  
    6161
    6262      if (Environment.Is64BitProcess) {
    63         Assert.AreEqual(0.99174959007940156, SamplesUtils.GetDoubleResult(osga, "BestQuality"), 1E-8, Environment.NewLine + "Best Qualitiy differs.");
    64         Assert.AreEqual(0.9836083751914968, SamplesUtils.GetDoubleResult(osga, "CurrentAverageQuality"), 1E-8, Environment.NewLine + "Current Average Quality differs.");
    65         Assert.AreEqual(0.98298394717065463, SamplesUtils.GetDoubleResult(osga, "CurrentWorstQuality"), 1E-8, Environment.NewLine + "Current Worst Quality differs.");
    66         Assert.AreEqual(10100, SamplesUtils.GetIntResult(osga, "EvaluatedSolutions"), Environment.NewLine + "Evaluated Solutions differ.");
    67         Assert.AreEqual(0.99174959007940156, bestTrainingSolution.TrainingRSquared, 1E-8, Environment.NewLine + "Best Training Solution Training R² differs.");
    68         Assert.AreEqual(0.896290231994223, bestTrainingSolution.TestRSquared, 1E-8, Environment.NewLine + "Best Training Solution Test R² differs.");
     63        // the following are the result values as produced on builder.heuristiclab.com
     64        // Unfortunately, running the same test on a different machine results in different values
     65        // For x86 environments the results below match but on x64 there is a difference
     66        // We tracked down the ConstantOptimizationEvaluator as a possible cause but have not
     67        // been able to identify the real cause. Presumably, execution on a Xeon and a Core i7 processor
     68        // leads to different results.
     69        Assert.AreEqual(0.90811178793448177, SamplesUtils.GetDoubleResult(osga, "BestQuality"), 1E-8, Environment.NewLine + "Best Qualitiy differs.");
     70        Assert.AreEqual(0.87264498853305739, SamplesUtils.GetDoubleResult(osga, "CurrentAverageQuality"), 1E-8, Environment.NewLine + "Current Average Quality differs.");
     71        Assert.AreEqual(0.75425658608938817, SamplesUtils.GetDoubleResult(osga, "CurrentWorstQuality"), 1E-8, Environment.NewLine + "Current Worst Quality differs.");
     72        Assert.AreEqual(8900, SamplesUtils.GetIntResult(osga, "EvaluatedSolutions"), Environment.NewLine + "Evaluated Solutions differ.");
     73        Assert.AreEqual(0.90811178793448177, bestTrainingSolution.TrainingRSquared, 1E-8, Environment.NewLine + "Best Training Solution Training R² differs.");
     74        // Assert.AreEqual(0.896290231994223, bestTrainingSolution.TestRSquared, 1E-8, Environment.NewLine + "Best Training Solution Test R² differs.");
    6975      } else {
    7076        Assert.AreEqual(0.9971536312165723, SamplesUtils.GetDoubleResult(osga, "BestQuality"), 1E-8, Environment.NewLine + "Best Qualitiy differs.");
     
    175181      evaluator.ConstantOptimizationIterations.Value = 5;
    176182      problem.EvaluatorParameter.Value = evaluator;
     183      problem.RelativeNumberOfEvaluatedSamplesParameter.Hidden = true;
     184      problem.SolutionCreatorParameter.Hidden = true;
    177185      #endregion
    178186
     
    201209      osga.SuccessRatioParameter.Hidden = true;
    202210      osga.SelectedParentsParameter.Hidden = true;
     211      osga.ElitesParameter.Hidden = true;
    203212
    204213      #endregion
  • stable/HeuristicLab.Tests/HeuristicLab.Tests.csproj

    r15217 r15257  
    460460    <Compile Include="HeuristicLab-3.3\Samples\GABppSampleTest.cs" />
    461461    <Compile Include="HeuristicLab-3.3\Samples\GPRobocodeSampleTest.cs" />
     462    <Compile Include="HeuristicLab-3.3\Samples\GPSymbolicRegressionSampleWithOSTest.cs" />
    462463    <Compile Include="HeuristicLab-3.3\Samples\OSESGriewankSampleTest.cs" />
    463464    <Compile Include="HeuristicLab-3.3\Samples\GAGroupingProblemSampleTest.cs" />
Note: See TracChangeset for help on using the changeset viewer.