Changeset 11237 for branches

Timestamp:

07/30/14 12:46:32 (10 years ago)

Author:

pfleck

Message:

#2208 fixed bug in score calculation and used quality parameter

File:

• branches/HeuristicLab.Problems.Orienteering/HeuristicLab.Problems.Orienteering/3.3/Improvers/OrienteeringLocalImprovementOperator.cs (modified) (6 diffs)

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

@@ -93 +93 @@
     }
     #endregion
+    public ILookupParameter<DoubleValue> QualityParameter {
+      get { return (ILookupParameter<DoubleValue>)Parameters["Quality"]; }
+    }
     #endregion
 
@@ -114 +117 @@
       Parameters.Add(new LookupParameter<IntValue>("EvaluatedSolutions", "The number of evaluated moves."));
       Parameters.Add(new LookupParameter<ResultCollection>("Results", "The name of the collection where the results are stored."));
+      Parameters.Add(new LookupParameter<DoubleValue>("Quality", "The quality value of the solution."));
     }
 
@@ -146 +150 @@
         // Determine if any of the visitable points can be included at any position within the tour
         IncludeNewPoints(tour, visitablePoints,
-          distances, fixedPenalty, maxLength,
-          ref tourLength, ref optimizationDone);
+          distances, fixedPenalty, maxLength, scores,
+          ref tourLength, ref tourScore, ref optimizationDone);
 
         // Determine if any of the visitable points can take the place of an already visited point in the tour to improve the scores
@@ -157 +161 @@
       // Set new tour
       IntegerVectorParameter.ActualValue = new IntegerVector(tour.ToArray());
+      QualityParameter.ActualValue.Value = tourScore;
 
       return base.Apply();
@@ -201 +206 @@
     }
     private void IncludeNewPoints(List<int> tour, List<int> visitablePoints,
-      DistanceMatrix distances, double fixedPenalty, double maxLength,
-      ref double tourLength, ref bool optimizationDone) {
+      DistanceMatrix distances, double fixedPenalty, double maxLength, DoubleArray scores,
+      ref double tourLength, ref double tourScore, ref bool optimizationDone) {
 
       for (int tourPosition = 1; tourPosition < tour.Count; tourPosition++) {
@@ -219 +224 @@
             tour.Insert(tourPosition, visitablePoints[i]);
 
-            // Update the overall tour tourLength
+            // Update the overall tour tourLength and score
             tourLength += detour;
+            tourScore += scores[visitablePoints[i]];
 
             // Re-run this optimization