Changeset 15703 for branches/1614_GeneralizedQAP/HeuristicLab.Problems.GeneralizedQuadraticAssignment.Algorithms

Timestamp:

01/31/18 22:04:21 (7 years ago)

Author:

abeham

Message:

#1614: Corrected namespace of random search and fixed problem that convergence graph doesn't get updated when terminating normally

Location:

branches/1614_GeneralizedQAP/HeuristicLab.Problems.GeneralizedQuadraticAssignment.Algorithms/3.3

Files:

• Infrastructure/Algorithms/ContextAlgorithm.cs (modified) (2 diffs)
• RandomSearch/RandomSearch.cs (modified) (1 diff)

branches/1614_GeneralizedQAP/HeuristicLab.Problems.GeneralizedQuadraticAssignment.Algorithms/3.3/Infrastructure/Algorithms/ContextAlgorithm.cs

@@ -191 +191 @@
 
     protected override void OnPaused() {
-      base.OnPaused();
       elapsed += stopwatch.Elapsed;
       stopwatch.Reset();
       firstHitGraph.Values[firstHitGraph.Values.Count - 1] = Tuple.Create(elapsed.TotalSeconds, Context.BestQuality);
+      base.OnPaused();
     }
 
     protected override void OnStopped() {
-      base.OnStopped();
       if (stopwatch.IsRunning) {
         elapsed += stopwatch.Elapsed;
@@ -204 +203 @@
         firstHitGraph.Values[firstHitGraph.Values.Count - 1] = Tuple.Create(elapsed.TotalSeconds, Context.BestQuality);
       }
+      // base call must be done last as the results will be cloned and a run is created
+      base.OnStopped();
     }
 

branches/1614_GeneralizedQAP/HeuristicLab.Problems.GeneralizedQuadraticAssignment.Algorithms/3.3/RandomSearch/RandomSearch.cs

@@ -29 +29 @@
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 
-namespace HeuristicLab.Problems.GeneralizedQuadraticAssignment.Algorithms.LocalSearch {
+namespace HeuristicLab.Problems.GeneralizedQuadraticAssignment.Algorithms.RandomSearch {
   [Item("Random Search (GQAP)", "Random search for the GQAP.")]
   [Creatable(CreatableAttribute.Categories.SingleSolutionAlgorithms)]
   [StorableClass]
-  public sealed class RandomSearch : StochasticAlgorithm<LocalSearchContext, IntegerVectorEncoding> {
+  public sealed class RandomSearch : StochasticAlgorithm<RandomSearchContext, IntegerVectorEncoding> {
 
     public override bool SupportsPause {