Changeset 11266

Timestamp:

08/05/14 09:54:07 (10 years ago)

Author:

pfleck

Message:

#2208

• Changed path visualization to line strip instead of polygon since start and end point must not match
• Used correct incremental length calculation in CleanupTour

Location:

branches/HeuristicLab.Problems.Orienteering

Files:

• HeuristicLab.Problems.Orienteering.Views/3.3/OrienteeringSolutionView.cs (modified) (1 diff)
• HeuristicLab.Problems.Orienteering/3.3/Shakers/OrienteeringShakingOperator.cs (modified) (2 diffs)

branches/HeuristicLab.Problems.Orienteering/HeuristicLab.Problems.Orienteering.Views/3.3/OrienteeringSolutionView.cs

@@ -109 +109 @@
                   tour[i] = points[integerVector[i]];
                 }
-                graphics.DrawPolygon(Pens.Black, tour);
+                graphics.DrawLines(Pens.Black, tour);
               }
 

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

@@ -216 +216 @@
       ).ToList();
 
-      //double tourLength = distances.CalculateTourLength(actualTour, fixedPenalty);
+      double tourLength = distances.CalculateTourLength(actualTour, fixedPenalty);
 
       // As long as the created path is infeasible, remove elements
-      while (distances.CalculateTourLength(actualTour, fixedPenalty) > maxDistance) {
+      while (tourLength > maxDistance) {
         // Remove the point that frees the largest distance
+        // Note, distance savings are not updated after removal
+        tourLength -= distances.CalculateRemovementSaving(actualTour, distanceSavings[0].Index, fixedPenalty);
         actualTour.RemoveAt(distanceSavings[0].Index);
-        //tourLength -= distanceSavings[0].Saving;
 
         // Shift indices due to removal of a point in the tour
@@ -228 +229 @@
           if (distanceSavings[i].Index > distanceSavings[0].Index) {
             distanceSavings[i].Index--;
-            // Note, distance savings are not updated after removal
           }
         }