Changeset 15698 for branches/1614_GeneralizedQAP/HeuristicLab.Problems.GeneralizedQuadraticAssignment.Algorithms/3.3/LocalSolverNet/GQAPIntegerSolver.cs

Timestamp:

01/31/18 14:01:55 (6 years ago)

Author:

abeham

Message:

#1614: Added random search and fixed execution time counting for commercial solvers

File:

• branches/1614_GeneralizedQAP/HeuristicLab.Problems.GeneralizedQuadraticAssignment.Algorithms/3.3/LocalSolverNet/GQAPIntegerSolver.cs (modified) (3 diffs)

branches/1614_GeneralizedQAP/HeuristicLab.Problems.GeneralizedQuadraticAssignment.Algorithms/3.3/LocalSolverNet/GQAPIntegerSolver.cs

@@ -21 +21 @@
 
 using System;
+using System.Linq;
 using System.Threading;
+using HeuristicLab.Analysis;
 using HeuristicLab.Common;
 using HeuristicLab.Core;
@@ -118 +120 @@
 
     protected override void Run(CancellationToken cancellationToken) {
+      var qpc = ((MultiAnalyzer)Analyzer).Operators.OfType<QualityPerClockAnalyzer>().FirstOrDefault();
+      if (qpc != null) {
+        qpc.LastUpdateTimeParameter.ActualName = Context.LastUpdateTimeParameter.Name;
+      }
       token = cancellationToken;
       lastUpdate = DateTime.UtcNow.AddSeconds(-1);
@@ -177 +183 @@
         localSolver.AddCallback(LSCallbackType.IterationTicked, LocalSolverOnIterationTicked);
 
+        Context.LastUpdateTimeParameter.Value = new DateTimeValue(DateTime.UtcNow);
+
         localSolver.Solve();
       } finally {