Changeset 14527 for trunk

Timestamp:

12/23/16 16:13:11 (8 years ago)

Author:

jkarder

Message:

#2524:

• made sure that P3 results are updated after cancellation
• fixed unit tests to also call Initialize

Location:

trunk/sources

Files:

• HeuristicLab.Algorithms.ParameterlessPopulationPyramid/3.3/ParameterlessPopulationPyramid.cs (modified) (1 diff)
• HeuristicLab.Tests/HeuristicLab.Algorithms.ParameterlessPopulationPyramid-3.3/ParameterlessPopulationPyramidTest.cs (modified) (1 diff)

trunk/sources/HeuristicLab.Algorithms.ParameterlessPopulationPyramid/3.3/ParameterlessPopulationPyramid.cs

@@ -250 +250 @@
       // Loop until iteration limit reached or canceled.
       while (ResultsIterations < MaximumIterations) {
-        cancellationToken.ThrowIfCancellationRequested();
-        double fitness = iterate();
-
-        ResultsEvaluations = tracker.Evaluations;
-        ResultsBestSolution = new BinaryVector(tracker.BestSolution);
-        ResultsBestQuality = tracker.BestQuality;
-        ResultsBestFoundOnEvaluation = tracker.BestFoundOnEvaluation;
-        ResultsQualitiesBest.Values.Add(tracker.BestQuality);
-        ResultsQualitiesIteration.Values.Add(fitness);
-        ResultsLevels.Values.Add(pyramid.Count);
-        ResultsSolutions.Values.Add(seen.Count);
-
-        ResultsIterations++;
+        double fitness = double.NaN;
+
+        try {
+          fitness = iterate();
+          ResultsIterations++;
+          cancellationToken.ThrowIfCancellationRequested();
+        } finally {
+          ResultsEvaluations = tracker.Evaluations;
+          ResultsBestSolution = new BinaryVector(tracker.BestSolution);
+          ResultsBestQuality = tracker.BestQuality;
+          ResultsBestFoundOnEvaluation = tracker.BestFoundOnEvaluation;
+          ResultsQualitiesBest.Values.Add(tracker.BestQuality);
+          ResultsQualitiesIteration.Values.Add(fitness);
+          ResultsLevels.Values.Add(pyramid.Count);
+          ResultsSolutions.Values.Add(seen.Count);
+        }
       }
     }

trunk/sources/HeuristicLab.Tests/HeuristicLab.Algorithms.ParameterlessPopulationPyramid-3.3/ParameterlessPopulationPyramidTest.cs

@@ -39 +39 @@
       PrivateObject hidden = new PrivateObject(solver);
       try {
-        hidden.Invoke("Run", new CancellationToken());
+        var ct = new CancellationToken();
+        hidden.Invoke("Initialize", ct);
+        hidden.Invoke("Run", ct);
       } catch (OperationCanceledException) {
         // Ignore