Changeset 7543

Timestamp:

03/05/12 10:15:50 (13 years ago)

Author:

svonolfe

Message:

Fixed minor issues (#1177)

Location:

branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4

Files:

• Encodings/Alba/AlbaEncoding.cs (modified) (1 diff)
• Encodings/Alba/Creators/RandomCreator.cs (modified) (1 diff)
• Encodings/General/TourEncoding.cs (modified) (1 diff)
• Encodings/Potvin/PotvinEncoding.cs (modified) (1 diff)
• ProblemInstances/VRPProblemInstance.cs (modified) (1 diff)

branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Alba/AlbaEncoding.cs

@@ -126 +126 @@
       int cities = instance.Cities.Value;
 
-      int vehicle = cities;
       for (int i = 0; i < route.Count; i++) {
-        if (route[i] == 0) {
-          route[i] = vehicle;
-          vehicle++;
+        if (route[i] <= 0) {
+          int vehicle = -route[i];
+          route[i] = cities + vehicle;
         } else {
           route[i] = route[i] - 1;

branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Alba/Creators/RandomCreator.cs

@@ -65 +65 @@
         perm[i] = i + 1;
       for (int i = cities; i < cities + vehicles; i++)
-        perm[i] = 0;
+        perm[i] = -(i - cities);
       for (int i = 0; i < perm.Length - 2; i++) {
         sortingArray[i] = RandomParameter.ActualValue.Next(perm.Length * 2);

branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/General/TourEncoding.cs

@@ -128 +128 @@
       Tour tour = new Tour();
       for (int i = 0; i < route.Count; i++) {
-        if (route[i] == 0) {
+        if (route[i] <= 0) {
           if (tour.Stops.Count > 0) {
             solution.Tours.Add(tour);

branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Potvin/PotvinEncoding.cs

@@ -130 +130 @@
       PotvinEncoding solution = new PotvinEncoding(instance);
 
-      TourEncoding.ConvertFrom(route, solution);
+      solution.Tours = new ItemList<Tour>();
+
+      Tour tour = new Tour();
+      int routeIdx = 0;
+      for (int i = 0; i < route.Count; i++) {
+        if (route[i] <= 0) {
+          if (tour.Stops.Count > 0) {
+            solution.Tours.Add(tour);
+            tour = new Tour();
+          }
+          int vehicle = -route[i];
+          solution.VehicleAssignment[routeIdx] = vehicle;
+          routeIdx++;
+        } else {
+          tour.Stops.Add(route[i]);
+        }
+      }
+
+      solution.Repair();
 
       return solution;

branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/ProblemInstances/VRPProblemInstance.cs

@@ -177 +177 @@
 
       for (int i = 0; i < distanceMatrix.Rows; i++) {
-        for (int j = i; j < distanceMatrix.Columns; j++) {
+        for (int j = 0; j < distanceMatrix.Columns; j++) {
           double distance = CalculateDistance(i, j);
 
           distanceMatrix[i, j] = distance;
-          distanceMatrix[j, i] = distance;
         }
       }