Changeset 9750 for branches/FitnessLandscapeAnalysis/HeuristicLab.Analysis.FitnessLandscape.VRP/Manipulators/OrOptManipulator.cs

Timestamp:

07/25/13 09:21:45 (11 years ago)

Author:

gkronber

Message:

#1591: adapted FLA branch to reference most recent version of ALGLIB (3.7.0) and VRP (3.4). Several major changes were necessary to port the implementation to the new VRP problem.

File:

• branches/FitnessLandscapeAnalysis/HeuristicLab.Analysis.FitnessLandscape.VRP/Manipulators/OrOptManipulator.cs (modified) (2 diffs)

branches/FitnessLandscapeAnalysis/HeuristicLab.Analysis.FitnessLandscape.VRP/Manipulators/OrOptManipulator.cs

@@ -48 +48 @@
 
     public static void Apply(IRandom random, PotvinEncoding individual) {
-      List<Tour> tours = individual.Tours.FindAll(t => t.Cities.Count >= 2);
+      List<Tour> tours = individual.Tours.FindAll(t => t.Stops.Count >= 2);
 
       if (tours.Count > 0) {
@@ -54 +54 @@
         Tour tour = tours[tourIdx];
 
-        int segmentStart = random.Next(tour.Cities.Count);
+        int segmentStart = random.Next(tour.Stops.Count);
         int segmentLength;
         if (segmentStart == 0) {
-          segmentLength = 1 + random.Next(tour.Cities.Count - 1);
+          segmentLength = 1 + random.Next(tour.Stops.Count - 1);
         } else {
-          segmentLength = 1 + random.Next(tour.Cities.Count - segmentStart);
+          segmentLength = 1 + random.Next(tour.Stops.Count - segmentStart);
         }
 
-        List<int> segment = tour.Cities.GetRange(segmentStart, segmentLength);
-        tour.Cities.RemoveRange(segmentStart, segmentLength);
+        List<int> segment = tour.Stops.GetRange(segmentStart, segmentLength);
+        tour.Stops.RemoveRange(segmentStart, segmentLength);
         int newPos;
-        if(tour.Cities.Count == 1)
+        if (tour.Stops.Count == 1)
           newPos = 0;
         else
-          newPos = random.Next(tour.Cities.Count - 1);
+          newPos = random.Next(tour.Stops.Count - 1);
 
         if (newPos >= segmentStart)
           newPos++;
-        tour.Cities.InsertRange(newPos, segment);
+        tour.Stops.InsertRange(newPos, segment);
       }
     }