Changeset 4151

Timestamp:

08/04/10 16:12:34 (14 years ago)

Author:

svonolfe

Message:

Adapted VRP view (#1039)

File:

• trunk/sources/HeuristicLab.Problems.VehicleRouting.Views/3.3/VRPSolutionView.cs (modified) (1 diff)

trunk/sources/HeuristicLab.Problems.VehicleRouting.Views/3.3/VRPSolutionView.cs

@@ -138 +138 @@
                 foreach (Tour tour in Content.Solution.Tours) {
                   double t = 0.0;
-                  Point[] tourPoints = new Point[tour.Count];
+                  Point[] tourPoints = new Point[tour.Count + 2];
                   int lastCustomer = 0;
 
-                  for (int i = 0; i < tour.Count; i++) {
-                    int customer = tour[i].Value;
-
-                    Point customerPoint = new Point(border + ((int)((coordinates[customer, 0] - xMin) * xStep)),
-                                    bitmap.Height - (border + ((int)((coordinates[customer, 1] - yMin) * yStep))));
-                    tourPoints[i] = customerPoint;
-
-                    if (i > 0) {
+                  for (int i = -1; i <= tour.Count; i++) {
+                    int location = 0;
+
+                    if (i == -1 || i == tour.Count)
+                      location = 0; //depot
+                    else
+                      location = tour[i].Value;
+
+                    Point locationPoint = new Point(border + ((int)((coordinates[location, 0] - xMin) * xStep)),
+                                    bitmap.Height - (border + ((int)((coordinates[location, 1] - yMin) * yStep))));
+                    tourPoints[i + 1] = locationPoint;
+
+                    if (i != -1 && i != tour.Count) {
                       Brush customerBrush = Brushes.Black;
 
                       t += VehicleRoutingProblem.GetDistance(
-                        lastCustomer, customer, coordinates, distanceMatrix, useDistanceMatrix);
-
-                      if (t < readyTime[customer]) {
-                        t = readyTime[customer];
+                        lastCustomer, location, coordinates, distanceMatrix, useDistanceMatrix);
+
+                      if (t < readyTime[location]) {
+                        t = readyTime[location];
                         customerBrush = Brushes.Yellow;
-                      } else if (t > dueTime[customer]) {
+                      } else if (t > dueTime[location]) {
                         customerBrush = Brushes.Red;
                       }
 
-                      t += serviceTime[customer];
-
-                      graphics.FillRectangle(customerBrush, customerPoint.X - 2, customerPoint.Y - 2, 6, 6);
+                      t += serviceTime[location];
+
+                      graphics.FillRectangle(customerBrush, locationPoint.X - 2, locationPoint.Y - 2, 6, 6);
                     }
-                    lastCustomer = customer;
+                    lastCustomer = location;
                   }