Changeset 17356 for branches/2521_ProblemRefactoring/HeuristicLab.Tests/HeuristicLab-3.3

Timestamp:

11/20/19 14:32:01 (5 years ago)

Author:

abeham

Message:

#2521: fixed some problems in Samples.Create unit tests and updated samples

Location:

branches/2521_ProblemRefactoring/HeuristicLab.Tests/HeuristicLab-3.3/Samples

Files:

• GAGroupingProblemSampleTest.cs (modified) (2 diffs)
• LocalSearchKnapsackSampleTest.cs (modified) (1 diff)
• SimulatedAnnealingRastriginSampleTest.cs (modified) (2 diffs)

branches/2521_ProblemRefactoring/HeuristicLab.Tests/HeuristicLab-3.3/Samples/GAGroupingProblemSampleTest.cs

@@ -40 +40 @@
 using System.Linq;
 using System.Collections.Generic;
+using System.Threading;
 using HeuristicLab.Common;
 using HeuristicLab.Core;
@@ -63 +64 @@
     }
 
-    public override double Evaluate(LinearLinkage solution, IRandom random) {
+    public override double Evaluate(LinearLinkage solution, IRandom random, CancellationToken token) {
       var penalty = 0;
       var groups = solution.GetGroups().ToList();

branches/2521_ProblemRefactoring/HeuristicLab.Tests/HeuristicLab-3.3/Samples/LocalSearchKnapsackSampleTest.cs

@@ -77 +77 @@
       ls.Problem = problem;
       ls.MaximumIterations.Value = 1000;
+      ls.MoveGenerator = ls.MoveGeneratorParameter.ValidValues
+        .OfType<ExhaustiveOneBitflipMoveGenerator>()
+        .Single();
       ls.MoveEvaluator = ls.MoveEvaluatorParameter.ValidValues  
         .OfType<KnapsackOneBitflipMoveEvaluator>()
-        .Single();
-      ls.MoveGenerator = ls.MoveGeneratorParameter.ValidValues
-        .OfType<ExhaustiveOneBitflipMoveGenerator>()
         .Single();
       ls.MoveMaker = ls.MoveMakerParameter.ValidValues

branches/2521_ProblemRefactoring/HeuristicLab.Tests/HeuristicLab-3.3/Samples/SimulatedAnnealingRastriginSampleTest.cs

@@ -78 +78 @@
       sa.InnerIterations.Value = 50;
       sa.MaximumIterations.Value = 100;
-      var moveEvaluator = sa.MoveEvaluatorParameter.ValidValues
-        .OfType<AdditiveMoveEvaluator>()
-        .Single();
-      sa.MoveEvaluator = moveEvaluator;
-
       var moveGenerator = sa.MoveGeneratorParameter.ValidValues
         .OfType<StochasticNormalMultiMoveGenerator>()
@@ -88 +83 @@
       moveGenerator.SigmaParameter.Value = new DoubleValue(1);
       sa.MoveGenerator = moveGenerator;
+
+      var moveEvaluator = sa.MoveEvaluatorParameter.ValidValues
+        .OfType<AdditiveMoveEvaluator>()
+        .Single();
+      sa.MoveEvaluator = moveEvaluator;
 
       sa.MoveMaker = sa.MoveMakerParameter.ValidValues