Changeset 15563 for branches/GeneralizedQAP/HeuristicLab.Problems.GeneralizedQuadraticAssignment.Algorithms/3.3/LocalSearch/IteratedLS.cs

Timestamp:

12/30/17 23:10:29 (6 years ago)

Author:

abeham

Message:

#1614:

• Added LAHC and pLAHC-s
• Changed all algorithms to update high frequency results only every second

File:

• branches/GeneralizedQAP/HeuristicLab.Problems.GeneralizedQuadraticAssignment.Algorithms/3.3/LocalSearch/IteratedLS.cs (modified) (4 diffs)

branches/GeneralizedQAP/HeuristicLab.Problems.GeneralizedQuadraticAssignment.Algorithms/3.3/LocalSearch/IteratedLS.cs

@@ -33 +33 @@
   [Creatable(CreatableAttribute.Categories.SingleSolutionAlgorithms)]
   [StorableClass]
-  public sealed class IteratedLS : ContextAlgorithm<LocalSearchContext> {
+  public sealed class IteratedLS : StochasticAlgorithm<LocalSearchContext> {
 
     public override bool SupportsPause {
@@ -92 +92 @@
 
     protected override void Run(CancellationToken cancellationToken) {
+      var lastUpdate = ExecutionTime;
+
       while (!StoppingCriterion()) {
         var lsevaluations = 0;
@@ -109 +111 @@
 
         IResult result;
-        if (Results.TryGetValue("Iterations", out result))
-          ((IntValue)result.Value).Value = Context.Iterations;
-        else Results.Add(new Result("Iterations", new IntValue(Context.Iterations)));
-        if (Results.TryGetValue("EvaluatedSolutions", out result))
-          ((IntValue)result.Value).Value = Context.EvaluatedSolutions;
-        else Results.Add(new Result("EvaluatedSolutions", new IntValue(Context.EvaluatedSolutions)));
+        if (ExecutionTime - lastUpdate > TimeSpan.FromSeconds(1)) {
+          if (Results.TryGetValue("Iterations", out result))
+            ((IntValue)result.Value).Value = Context.Iterations;
+          else Results.Add(new Result("Iterations", new IntValue(Context.Iterations)));
+          if (Results.TryGetValue("EvaluatedSolutions", out result))
+            ((IntValue)result.Value).Value = Context.EvaluatedSolutions;
+          else Results.Add(new Result("EvaluatedSolutions", new IntValue(Context.EvaluatedSolutions)));
+          lastUpdate = ExecutionTime;
+        }
         if (Results.TryGetValue("BestQuality", out result))
           ((DoubleValue)result.Value).Value = Context.BestQuality;
@@ -127 +132 @@
         if (cancellationToken.IsCancellationRequested) break;
       }
+      IResult result2;
+      if (Results.TryGetValue("Iterations", out result2))
+        ((IntValue)result2.Value).Value = Context.Iterations;
+      else Results.Add(new Result("Iterations", new IntValue(Context.Iterations)));
+      if (Results.TryGetValue("EvaluatedSolutions", out result2))
+        ((IntValue)result2.Value).Value = Context.EvaluatedSolutions;
+      else Results.Add(new Result("EvaluatedSolutions", new IntValue(Context.EvaluatedSolutions)));
     }