Changeset 4352 for trunk/sources/HeuristicLab.Problems.VehicleRouting.Views/3.3/VRPSolutionView.cs

Timestamp:

09/01/10 11:13:46 (14 years ago)

Author:

svonolfe

Message:

Merged r4351 of the VRP feature branch into trunk (#1039)

Location:

trunk/sources/HeuristicLab.Problems.VehicleRouting.Views

Files:

• . (modified) (1 prop)
• 3.3/VRPSolutionView.cs (modified) (5 diffs)

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

@@ -27 +27 @@
 using HeuristicLab.MainForm;
 using HeuristicLab.Problems.VehicleRouting.Encodings;
+using HeuristicLab.Parameters;
+using System.Linq;
 
 namespace HeuristicLab.Problems.VehicleRouting.Views {
@@ -67 +69 @@
       } else {
         GenerateImage();
-        tourViewHost.Content = Content.Solution;
+        UpdateTourView();
       }
     }
@@ -80 +82 @@
       pictureBox.Enabled = Content != null;
       tourGroupBox.Enabled = Content != null;
+    }
+
+    private void UpdateTourView() {
+      tourGridView.Rows.Clear();
+      tourGridView.ColumnCount = Content.Coordinates.Rows - 1;
+
+      if (Content != null && Content.Solution != null) {
+        foreach (Tour tour in Content.Solution.GetTours(new ValueLookupParameter<DoubleMatrix>("DistanceMatrix", Content.DistanceMatrix))) {
+          int row = tourGridView.Rows.Add();
+          int cell = 0;
+          foreach (int city in tour.Cities) {
+            tourGridView.Rows[row].Cells[cell].Value = city;
+            cell++;
+          }
+        }
+      }
     }
 
@@ -119 +137 @@
               if (Content.Solution != null) {
                 int currentTour = 0;
-                foreach (Tour tour in Content.Solution.Tours) {
+                foreach (Tour tour in Content.Solution.GetTours(new ValueLookupParameter<DoubleMatrix>("DistanceMatrix", distanceMatrix))) {
                   double t = 0.0;
                   Point[] tourPoints = new Point[tour.Cities.Count + 2];
@@ -202 +220 @@
       else {
         GenerateImage();
-        tourViewHost.Content = Content.Solution;
+        UpdateTourView();
       }
     }