Changeset 15633 for branches

Timestamp:

01/19/18 09:05:35 (7 years ago)

Author:

abeham

Message:

#1614: changed localsolver algorithms to run analyzer at the end

Location:

branches/GeneralizedQAP/HeuristicLab.Problems.GeneralizedQuadraticAssignment.Algorithms/3.3/LocalSolverNet

Files:

• GQAPBinarySolver.cs (modified) (1 diff)
• GQAPIntegerSolver.cs (modified) (1 diff)

branches/GeneralizedQAP/HeuristicLab.Problems.GeneralizedQuadraticAssignment.Algorithms/3.3/LocalSolverNet/GQAPBinarySolver.cs

@@ -196 +196 @@
       model.Minimize(obj);
 
-      model.Close();
-
-      // Parameterizes the solver.
-      LSPhase phase = localSolver.CreatePhase();
-      phase.SetTimeLimit((int)Math.Ceiling(MaximumRuntime.TotalSeconds));
-
-      localSolver.AddCallback(LSCallbackType.IterationTicked, LocalSolverOnIterationTicked);
-      
-      localSolver.Solve();
-
-      localSolver.RemoveCallback(LSCallbackType.IterationTicked, LocalSolverOnIterationTicked);
-      localSolver.Dispose();
+      try {
+        model.Close();
+
+        // Parameterizes the solver.
+        LSPhase phase = localSolver.CreatePhase();
+        phase.SetTimeLimit((int)Math.Ceiling(MaximumRuntime.TotalSeconds));
+
+        localSolver.AddCallback(LSCallbackType.IterationTicked, LocalSolverOnIterationTicked);
+
+        localSolver.Solve();
+
+        localSolver.RemoveCallback(LSCallbackType.IterationTicked, LocalSolverOnIterationTicked);
+      } finally {
+        localSolver.Dispose();
+      }
+
+      Context.RunOperator(Analyzer, CancellationToken.None);
     }
   }

branches/GeneralizedQAP/HeuristicLab.Problems.GeneralizedQuadraticAssignment.Algorithms/3.3/LocalSolverNet/GQAPIntegerSolver.cs

@@ -181 +181 @@
         localSolver.Dispose();
       }
+
+      Context.RunOperator(Analyzer, CancellationToken.None);
     }
   }