Changeset 11320 for branches/HeuristicLab.Problems.Orienteering/HeuristicLab.Problems.Orienteering/3.3/Shakers/OrienteeringShakingOperator.cs

Timestamp:

09/01/14 10:36:54 (10 years ago)

Author:

pfleck

Message:

#2208 Renamed FixedPenalty to PointVisitingCosts

File:

• branches/HeuristicLab.Problems.Orienteering/HeuristicLab.Problems.Orienteering/3.3/Shakers/OrienteeringShakingOperator.cs (modified) (7 diffs)

branches/HeuristicLab.Problems.Orienteering/HeuristicLab.Problems.Orienteering/3.3/Shakers/OrienteeringShakingOperator.cs

@@ -76 +76 @@
       get { return (ILookupParameter<DoubleArray>)Parameters["Scores"]; }
     }
-    public ILookupParameter<DoubleValue> FixedPenaltyParameter {
-      get { return (ILookupParameter<DoubleValue>)Parameters["FixedPenalty"]; }
+    public ILookupParameter<DoubleValue> PointVisitingCostsParameter {
+      get { return (ILookupParameter<DoubleValue>)Parameters["PointVisitingCosts"]; }
     }
 
@@ -101 +101 @@
       Parameters.Add(new LookupParameter<DistanceMatrix>("DistanceMatrix", "The matrix which contains the distances between the points."));
       Parameters.Add(new LookupParameter<DoubleArray>("Scores", "The scores of the points."));
-      Parameters.Add(new LookupParameter<DoubleValue>("FixedPenalty", "The penalty for each visited vertex."));
+      Parameters.Add(new LookupParameter<DoubleValue>("PointVisitingCosts", "The costs for visiting a point."));
 
       Parameters.Add(new LookupParameter<IRandom>("Random", "The random number generator that will be used."));
@@ -116 +116 @@
       var startingPoint = StartingPointParameter.ActualValue.Value;
       var terminalPoint = TerminalPointParameter.ActualValue.Value;
-      var fixedPenalty = FixedPenaltyParameter.ActualValue.Value;
+      var pointVisitingCosts = PointVisitingCostsParameter.ActualValue.Value;
       double maxDistance = MaximumDistanceParameter.ActualValue.Value;
       int numPoints = scores.Length;
@@ -139 +139 @@
           from point in Enumerable.Range(0, numPoints)
           // Calculate the distance when going from the starting point to this point and then to the end point
-          let distance = distances[startingPoint, point] + distances[point, terminalPoint] + fixedPenalty
+          let distance = distances[startingPoint, point] + distances[point, terminalPoint] + pointVisitingCosts
           // If this distance is feasible and the point is neither starting nor ending point, check the point
           where distance < maxDistance && point != startingPoint && point != terminalPoint
@@ -157 +157 @@
 
         // Bring the tour back to be feasible 
-        CleanupTour(actualTour, distances, maxDistance, fixedPenalty);
+        CleanupTour(actualTour, distances, maxDistance, pointVisitingCosts);
 
         // Set new Tour
@@ -208 +208 @@
       }
     }
-    private void CleanupTour(List<int> actualTour, DistanceMatrix distances, double maxDistance, double fixedPenalty) {
+    private void CleanupTour(List<int> actualTour, DistanceMatrix distances, double maxDistance, double pointVisitingCosts) {
       // Sort the points on the tour according to their costs savings when removed
       var distanceSavings = (
         from removePosition in Enumerable.Range(1, actualTour.Count - 2)
-        let saving = distances.CalculateRemovementSaving(actualTour, removePosition, fixedPenalty)
+        let saving = distances.CalculateRemovementSaving(actualTour, removePosition, pointVisitingCosts)
         orderby saving descending
         select new SavingInfo { Index = removePosition, Saving = saving }
       ).ToList();
 
-      double tourLength = distances.CalculateTourLength(actualTour, fixedPenalty);
+      double tourLength = distances.CalculateTourLength(actualTour, pointVisitingCosts);
 
       // As long as the created path is infeasible, remove elements
@@ -223 +223 @@
         // Remove the point that frees the largest distance
         // Note, distance savings are not updated after removal
-        tourLength -= distances.CalculateRemovementSaving(actualTour, distanceSavings[0].Index, fixedPenalty);
+        tourLength -= distances.CalculateRemovementSaving(actualTour, distanceSavings[0].Index, pointVisitingCosts);
         actualTour.RemoveAt(distanceSavings[0].Index);