Changeset 11320 for branches/HeuristicLab.Problems.Orienteering/HeuristicLab.Problems.Orienteering/3.3/Creators/GreedyOrienteeringTourCreator.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/Creators/GreedyOrienteeringTourCreator.cs (modified) (5 diffs)

branches/HeuristicLab.Problems.Orienteering/HeuristicLab.Problems.Orienteering/3.3/Creators/GreedyOrienteeringTourCreator.cs

@@ -55 +55 @@
       get { return (ILookupParameter<IntValue>)Parameters["TerminalPoint"]; }
     }
-    public ILookupParameter<DoubleValue> FixedPenaltyParameter {
-      get { return (ILookupParameter<DoubleValue>)Parameters["FixedPenalty"]; }
+    public ILookupParameter<DoubleValue> PointVisitingCostsParameter {
+      get { return (ILookupParameter<DoubleValue>)Parameters["PointVisitingCosts"]; }
     }
     #endregion
@@ -73 +73 @@
       Parameters.Add(new LookupParameter<IntValue>("StartingPoint", "Index of the starting point."));
       Parameters.Add(new LookupParameter<IntValue>("TerminalPoint", "Index of the ending point."));
-      Parameters.Add(new LookupParameter<DoubleValue>("FixedPenalty", "The penalty for each visited vertex."));
+      Parameters.Add(new LookupParameter<DoubleValue>("PointVisitingCosts", "The costs for visiting a point."));
     }
 
@@ -85 +85 @@
       int numPoints = ScoresParameter.ActualValue.Length;
       var distances = DistanceMatrixParameter.ActualValue;
-      double fixedPenalty = FixedPenaltyParameter.ActualValue.Value;
+      double pointVisitingCosts = PointVisitingCostsParameter.ActualValue.Value;
       double maxDistance = MaximumDistanceParameter.ActualValue.Value;
       var scores = ScoresParameter.ActualValue;
@@ -92 +92 @@
       var feasiblePoints = (
         from point in Enumerable.Range(0, numPoints)
-        let distance = distances[startPoint, point] + distances[point, endPoint] + fixedPenalty
+        let distance = distances[startPoint, point] + distances[point, endPoint] + pointVisitingCosts
         let score = scores[point]
         where distance <= maxDistance
@@ -115 +115 @@
           for (int insertPosition = 1; insertPosition < tour.Count; insertPosition++) {
             // Create the candidate tour
-            double detour = distances.CalculateInsertionCosts(tour, insertPosition, feasiblePoints[i], fixedPenalty);
+            double detour = distances.CalculateInsertionCosts(tour, insertPosition, feasiblePoints[i], pointVisitingCosts);
 
             // If the insertion would be feasible, perform it