Changeset 11228 for branches/HeuristicLab.Problems.Orienteering/HeuristicLab.Problems.Orienteering/3.3/DistanceMatrix.cs

Timestamp:

07/29/14 15:43:47 (10 years ago)

Author:

pfleck

Message:

#2208:

• Fixed bugs in cost calculation of insertion and replacement
• Rewritten Cleanup of infeasible tours
• Small refactoring

File:

• branches/HeuristicLab.Problems.Orienteering/HeuristicLab.Problems.Orienteering/3.3/DistanceMatrix.cs (modified) (1 diff)

branches/HeuristicLab.Problems.Orienteering/HeuristicLab.Problems.Orienteering/3.3/DistanceMatrix.cs

@@ -55 +55 @@
     public double CalculateTourLength(IList<int> path, double fixedPenalty) {
       double length = 0.0;
-
-      for (int i = 1; i < path.Count; i++) {
-        length += this[i - 1, i];
-      }
-
+      for (int i = 1; i < path.Count; i++)
+        length += this[path[i - 1], path[i]];
       // Add the fixed penalty for every vertex except for the starting and ending vertex
       length += (path.Count - 2) * fixedPenalty;
-
       return length;
     }
-
-    public double CalculateInsertionCosts(IList<int> path, int pointPosition, int insertPosition, double fixedPenalty) {
-      double detour = this[path[insertPosition - 1], pointPosition] + this[pointPosition, path[insertPosition]];
+    public double CalculateInsertionCosts(IList<int> path, int insertPosition, int point, double fixedPenalty) {
+      double detour = this[path[insertPosition - 1], point] + this[point, path[insertPosition]];
       detour += fixedPenalty;
       detour -= this[path[insertPosition - 1], path[insertPosition]];
       return detour;
     }
-
-    public double CalculateReplacementCosts(List<int> path, int pointPosition, int replacementPosition) {
-      double detour = this[pointPosition - 1, replacementPosition] + this[replacementPosition, pointPosition + 1];
-      detour -= this[pointPosition - 1, pointPosition] + this[pointPosition, pointPosition + 1];
+    public double CalculateReplacementCosts(List<int> path, int replacePosition, int point) {
+      double detour = this[path[replacePosition - 1], point] + this[point, path[replacePosition + 1]];
+      detour -= this[path[replacePosition - 1], path[replacePosition]] + this[path[replacePosition], path[replacePosition + 1]];
       return detour;
+    }
+    public double CalculateRemovementSaving(List<int> path, int removePosition, double fixedPenalty) {
+      double saving = this[path[removePosition - 1], path[removePosition]];
+      saving += this[path[removePosition], path[removePosition + 1]];
+      saving -= this[path[removePosition - 1], path[removePosition + 1]];
+      saving += fixedPenalty;
+      return saving;
     }
   }