Changeset 6947

Timestamp:

11/04/11 11:44:37 (12 years ago)

Author:

svonolfe

Message:

Fixed small issues in view and crossover (#1177)

Location:

branches/VRP

Files:

• HeuristicLab.Problems.VehicleRouting.Views/3.4/MDCVRPPDTWView.cs (modified) (2 diffs)
• HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Potvin/Crossovers/PotvinInsertionBasedCrossover.cs (modified) (2 diffs)

branches/VRP/HeuristicLab.Problems.VehicleRouting.Views/3.4/MDCVRPPDTWView.cs

@@ -170 +170 @@
           } else {
             {
-              Point[] locationPoints = new Point[coordinates.Rows];
+              Point[] locationPoints = new Point[cities];
               //just draw customers
-              for (int i = 1; i < coordinates.Rows; i++) {
-                locationPoints[i] = new Point(border + ((int)((coordinates[i, 0] - xMin) * xStep)),
-                                bitmap.Height - (border + ((int)((coordinates[i, 1] - yMin) * yStep))));
+              for (int i = 0; i < cities; i++) {
+                locationPoints[i] = new Point(border + ((int)((Content.GetCoordinates(i + 1)[0] - xMin) * xStep)),
+                                bitmap.Height - (border + ((int)((Content.GetCoordinates(i + 1)[1] - yMin) * yStep))));
 
                 graphics.FillRectangle(Brushes.Black, locationPoints[i].X - 3, locationPoints[i].Y - 3, 6, 6);
@@ -182 +182 @@
                 for (int i = 0; i < cities; i++) {
                   if (demand[i] < 0) {
-                    graphics.DrawLine(flowPen, locationPoints[pickupDeliveryLocation[i]], locationPoints[i + 1]);
+                    graphics.DrawLine(flowPen, locationPoints[pickupDeliveryLocation[i] - 1], locationPoints[i]);
                   }
                 }

branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Potvin/Crossovers/PotvinInsertionBasedCrossover.cs

@@ -205 +205 @@
 
       int length = Math.Min(Length.Value.Value, parent1.Tours.Count) + 1;
-      int k = random.Next(1, length);
+      int k = 1;
+      if(length > 1)
+        k = random.Next(1, length);
       for (int i = 0; i < k; i++) {
         int index = SelectRandomTourBiasedByLength(random, p1Clone);
@@ -227 +229 @@
 
         //DESTROY - remove cities from r1
-        int removed = random.Next(1, r1.Stops.Count + 1);
+        int removed = 1;
+        if(r1.Stops.Count > 1)
+          removed = random.Next(1, r1.Stops.Count + 1);
         for (int i = 0; i < removed; i++) {
           childTour.Stops.RemoveAt(SelectCityBiasedByNeighborDistance(random, childTour, child));