Changeset 9750 for branches/FitnessLandscapeAnalysis/HeuristicLab.Analysis.FitnessLandscape.VRP/DistanceCalcualtors

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/DistanceCalcualtors/VRPDistanceCalculator.cs (modified) (2 diffs)

branches/FitnessLandscapeAnalysis/HeuristicLab.Analysis.FitnessLandscape.VRP/DistanceCalcualtors/VRPDistanceCalculator.cs

@@ -10 +10 @@
 using HeuristicLab.Encodings.PermutationEncoding;
 using HeuristicLab.Problems.VehicleRouting;
+using HeuristicLab.Problems.VehicleRouting.Interfaces;
 
 namespace HeuristicLab.Analysis.FitnessLandscape.DistanceCalculators.VRP {
@@ -61 +62 @@
     private HashSet<Point> GetEdgeSet(IVRPEncoding vrpSolution) {
       HashSet<Point> edges = new HashSet<Point>();
-      foreach (var tour in vrpSolution.GetTours(null)) {
-        if (tour.Cities.Count > 0) {
-          edges.Add(CreateUndirectedEdge(0, tour.Cities[0]));
-          for (int i = 0; i < tour.Cities.Count - 1; i++) {
-            edges.Add(CreateUndirectedEdge(tour.Cities[i], tour.Cities[i + 1]));
+      foreach (var tour in vrpSolution.GetTours()) {
+        if (tour.Stops.Count > 0) {
+          edges.Add(CreateUndirectedEdge(0, tour.Stops[0]));
+          for (int i = 0; i < tour.Stops.Count - 1; i++) {
+            edges.Add(CreateUndirectedEdge(tour.Stops[i], tour.Stops[i + 1]));
           }
-          edges.Add(CreateUndirectedEdge(tour.Cities.Last(), 0));
+          edges.Add(CreateUndirectedEdge(tour.Stops.Last(), 0));
         }
       }