Changeset 17533 for branches/2521_ProblemRefactoring/HeuristicLab.Problems.Orienteering/3.3/Improvers

Timestamp:

05/08/20 16:55:51 (5 years ago)

Author:

abeham

Message:

#2521: Unified architecture

File:

• branches/2521_ProblemRefactoring/HeuristicLab.Problems.Orienteering/3.3/Improvers/OrienteeringLocalImprovementOperator.cs (modified) (2 diffs)

branches/2521_ProblemRefactoring/HeuristicLab.Problems.Orienteering/3.3/Improvers/OrienteeringLocalImprovementOperator.cs

@@ -126 +126 @@
 
         // Determine all points that have not yet been visited by this tour
-        var visitablePoints = Enumerable.Range(0, data.RoutingData.Cities).Except(tour).ToList();
+        var visitablePoints = Enumerable.Range(0, data.Cities).Except(tour).ToList();
 
         // Determine if any of the visitable points can be included at any position within the tour
@@ -168 +168 @@
             double newLength = tourLength;
             // Recalculate length of whole swapped part, in case distances are not symmetric
-            for (int index = position - 1; index < position + blockLength; index++) newLength -= data.RoutingData.GetDistance(tour[index], tour[index + 1]);
-            for (int index = position + blockLength - 1; index > position; index--) newLength += data.RoutingData.GetDistance(tour[index], tour[index - 1]);
-            newLength += data.RoutingData.GetDistance(tour[position - 1], tour[position + blockLength - 1]);
-            newLength += data.RoutingData.GetDistance(tour[position], tour[position + blockLength]);
+            for (int index = position - 1; index < position + blockLength; index++) newLength -= data.GetDistance(tour[index], tour[index + 1]);
+            for (int index = position + blockLength - 1; index > position; index--) newLength += data.GetDistance(tour[index], tour[index - 1]);
+            newLength += data.GetDistance(tour[position - 1], tour[position + blockLength - 1]);
+            newLength += data.GetDistance(tour[position], tour[position + blockLength]);
 
             if (newLength < tourLength - 0.00001) {