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

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

@@ -58 +58 @@
       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"]; }
     }
     #region ILocalImprovementOperator Parameters
@@ -99 +99 @@
       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."));
 
       Parameters.Add(new ValueLookupParameter<IntValue>("LocalIterations", "The number of iterations that have already been performed.", new IntValue(0)));
@@ -119 +119 @@
       var distances = DistanceMatrixParameter.ActualValue;
       var scores = ScoresParameter.ActualValue;
-      double fixedPenalty = FixedPenaltyParameter.ActualValue.Value;
+      double pointVisitingCosts = PointVisitingCostsParameter.ActualValue.Value;
       double maxLength = MaximumDistanceParameter.ActualValue.Value;
       int maxIterations = MaximumIterationsParameter.ActualValue.Value;
@@ -129 +129 @@
       var tour = IntegerVectorParameter.ActualValue.ToList();
 
-      double tourLength = distances.CalculateTourLength(tour, fixedPenalty);
+      double tourLength = distances.CalculateTourLength(tour, pointVisitingCosts);
       double tourScore = tour.Sum(point => scores[point]);
 
@@ -148 +148 @@
         // Determine if any of the visitable points can be included at any position within the tour
         IncludeNewPoints(tour, visitablePoints,
-          distances, fixedPenalty, maxLength, scores,
+          distances, pointVisitingCosts, maxLength, scores,
           ref tourLength, ref tourScore, ref evaluations, ref optimizationDone);
 
@@ -211 +211 @@
     }
     private void IncludeNewPoints(List<int> tour, List<int> visitablePoints,
-      DistanceMatrix distances, double fixedPenalty, double maxLength, DoubleArray scores,
+      DistanceMatrix distances, double pointVisitingCosts, double maxLength, DoubleArray scores,
       ref double tourLength, ref double tourScore, ref int evaluations, ref bool optimizationDone) {
 
@@ -224 +224 @@
           evaluations++;
 
-          double detour = distances.CalculateInsertionCosts(tour, tourPosition, visitablePoints[i], fixedPenalty);
+          double detour = distances.CalculateInsertionCosts(tour, tourPosition, visitablePoints[i], pointVisitingCosts);
 
           // Determine if including the point does not violate any constraint