Changeset 15713 for branches/1614_GeneralizedQAP/HeuristicLab.Problems.GeneralizedQuadraticAssignment.Algorithms/3.3/LocalSolverNet

Timestamp:

02/02/18 16:31:42 (7 years ago)

Author:

abeham

Message:

#1614:

• added additional constraint to benchmark data generator and updated one instance that was affected by this
• added fitness landscape characteristics for the GQAP
• fixed RLD analysis view to compensate for empty convergence graphs
• fixed CPLEX solvers not using the obj value when the solver terminates (callback is not called if proven optimal solution is found)
• added code for local solver to also check on final quality

Location:

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

Files:

• GQAPBinarySolver.cs (modified) (3 diffs)
• GQAPIntegerSolver.cs (modified) (3 diffs)

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

@@ -89 +89 @@
 
       if (curObj >= prevObj) return;
-      prevObj = curObj;
-      Context.BestQuality = curObj;
-           
+      UpdateSolution(curObj);
+
+      Context.RunOperator(Analyzer, CancellationToken.None);
+
+      if (StoppingCriterion()) localSolver.Stop();
+    }
+
+    private void UpdateSolution(double obj) {
+      IResult result;
+      prevObj = obj;
+      Context.BestQuality = obj;
+
       if (Results.TryGetValue("BestQuality", out result))
         ((DoubleValue)result.Value).Value = Context.BestQuality;
@@ -116 +125 @@
         result.Value = Context.BestSolution;
       else Results.Add(new Result("BestSolution", Context.BestSolution));
-
-      Context.RunOperator(Analyzer, CancellationToken.None);
-
-      if (StoppingCriterion()) localSolver.Stop();
     }
 
@@ -213 +218 @@
         localSolver.Solve();
 
+        var curObj = obj.GetDoubleValue();
+        if (curObj < prevObj)
+          UpdateSolution(curObj);
+
         localSolver.RemoveCallback(LSCallbackType.IterationTicked, LocalSolverOnIterationTicked);
       } finally {

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

@@ -88 +88 @@
 
       if (curObj >= prevObj) return;
-      prevObj = curObj;
-      Context.BestQuality = curObj;
-           
+      UpdateSolution(curObj);
+
+      Context.RunOperator(Analyzer, CancellationToken.None);
+
+      if (StoppingCriterion()) localSolver.Stop();
+    }
+
+    private void UpdateSolution(double obj) {
+      IResult result;
+      prevObj = obj;
+      Context.BestQuality = obj;
+
       if (Results.TryGetValue("BestQuality", out result))
         ((DoubleValue)result.Value).Value = Context.BestQuality;
@@ -110 +119 @@
         result.Value = Context.BestSolution;
       else Results.Add(new Result("BestSolution", Context.BestSolution));
-
-      Context.RunOperator(Analyzer, CancellationToken.None);
-
-      if (StoppingCriterion()) localSolver.Stop();
     }
 
@@ -184 +189 @@
 
         localSolver.Solve();
+
+        var curObj = obj.GetDoubleValue();
+        if (curObj < prevObj)
+          UpdateSolution(curObj);
+
+        localSolver.RemoveCallback(LSCallbackType.IterationTicked, LocalSolverOnIterationTicked);
       } finally {
         localSolver.Dispose();