Changeset 11193 for branches

Timestamp:

07/16/14 12:27:31 (10 years ago)

Author:

pfleck

Message:

#2208 Implemented OrienteeringLocalImprovementOperator.

Location:

branches/HeuristicLab.Problems.Orienteering/HeuristicLab.Problems.Orienteering/3.3

Files:

• DistanceMatrix.cs (modified) (1 diff)
• HeuristicLab.Problems.Orienteering-3.3.csproj (modified) (1 diff)
• Improvers (added)
• Improvers/OrienteeringLocalImprovementOperator.cs (added)

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

@@ -66 +66 @@
     }
 
-    public double CalculateInsertionCost(IList<int> path, int point, int insertPosition, double fixedPenalty) {
-      double detour = this[path[insertPosition - 1], point] + this[point, path[insertPosition]];
+    public double CalculateInsertionCosts(IList<int> path, int pointPosition, int insertPosition, double fixedPenalty) {
+      double detour = this[path[insertPosition - 1], pointPosition] + this[pointPosition, 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];
+      return detour;
+    }
   }
 }

branches/HeuristicLab.Problems.Orienteering/HeuristicLab.Problems.Orienteering/3.3/HeuristicLab.Problems.Orienteering-3.3.csproj

@@ -49 +49 @@
     <Compile Include="Creators\GreedyOrienteeringTourCreator.cs" />
     <Compile Include="DistanceMatrix.cs" />
+    <Compile Include="Improvers\OrienteeringLocalImprovementOperator.cs" />
     <Compile Include="Interfaces\IOrienteeringEvaluator.cs" />
     <Compile Include="Evaluators\OrienteeringEvaluator.cs" />