Changeset 15256 for branches/PerformanceComparison/HeuristicLab.Algorithms.MemPR/3.3

Timestamp:

07/15/17 14:25:44 (7 years ago)

Author:

abeham

Message:

#2457: merged trunk into branch

Location:

branches/PerformanceComparison/HeuristicLab.Algorithms.MemPR/3.3/LinearLinkage

Files:

• LinearLinkageMemPR.cs (modified) (3 diffs)
• LocalSearch/StaticAPI/ExhaustiveLocalSearch.cs (modified) (1 diff)

branches/PerformanceComparison/HeuristicLab.Algorithms.MemPR/3.3/LinearLinkage/LinearLinkageMemPR.cs

@@ -120 +120 @@
       var groupItems = new List<int>();
       var lleb = current.ToBackLinks();
-      Move bestOfTheRest = null;
+      EMSSMove bestOfTheRest = null;
       var bestOfTheRestF = double.NaN;
       var lastAppliedMove = -1;
@@ -161 +161 @@
             break;
           } else {
-            foreach (var move in MoveGenerator.GenerateForItem(i, groupItems, current, lleb)) {
+            foreach (var move in ExhaustiveEMSSMoveGenerator.GenerateForItem(i, groupItems, current, lleb)) {
               // we intend to break link i -> next
               var qualityToBreak = tabu[i, next];
@@ -289 +289 @@
       ISingleObjectiveSolutionScope<LinearLinkage> best = null;
       while (true) {
-        Move bestMove = null;
+        EMSSMove bestMove = null;
         var bestMoveQ = double.NaN;
         // this approach may not fully relink the two solutions
-        foreach (var m in MoveGenerator.Generate(probe.Solution)) {
+        foreach (var m in ExhaustiveEMSSMoveGenerator.Generate(probe.Solution)) {
           var distBefore = Dist(probe, b);
           m.Apply(probe.Solution);

branches/PerformanceComparison/HeuristicLab.Algorithms.MemPR/3.3/LinearLinkage/LocalSearch/StaticAPI/ExhaustiveLocalSearch.cs

@@ -42 +42 @@
         var groupItems = new List<int>();
         for (var i = 0; i < solution.Length; i++) {
-          foreach (var move in MoveGenerator.GenerateForItem(i, groupItems, solution, lleb).ToList()) {
+          foreach (var move in ExhaustiveEMSSMoveGenerator.GenerateForItem(i, groupItems, solution, lleb).ToList()) {
             move.Apply(solution);
             var moveF = eval(solution, token);