Changeset 4352 for trunk/sources/HeuristicLab.Problems.VehicleRouting.Views

Timestamp:

09/01/10 11:13:46 (15 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.Designer.cs (modified) (6 diffs)
• 3.3/VRPSolutionView.cs (modified) (5 diffs)
• 3.3/VehicleRoutingProblemView.Designer.cs (modified) (10 diffs)
• 3.3/VehicleRoutingProblemView.cs (modified) (2 diffs)

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

@@ -50 +50 @@
       this.valueTabPage = new System.Windows.Forms.TabPage();
       this.tourGroupBox = new System.Windows.Forms.GroupBox();
-      this.tourViewHost = new HeuristicLab.MainForm.WindowsForms.ViewHost();
+      this.tourGridView = new System.Windows.Forms.DataGridView();
       this.tabControl.SuspendLayout();
       this.visualizationTabPage.SuspendLayout();
@@ -56 +56 @@
       this.valueTabPage.SuspendLayout();
       this.tourGroupBox.SuspendLayout();
+      ((System.ComponentModel.ISupportInitialize)(this.tourGridView)).BeginInit();
       this.SuspendLayout();
       // 
@@ -100 +101 @@
       this.valueTabPage.Name = "valueTabPage";
       this.valueTabPage.Padding = new System.Windows.Forms.Padding(3);
-      this.valueTabPage.Size = new System.Drawing.Size(415, 398);
+      this.valueTabPage.Size = new System.Drawing.Size(415, 532);
       this.valueTabPage.TabIndex = 1;
       this.valueTabPage.Text = "Value";
@@ -107 +108 @@
       // tourGroupBox
       // 
-      this.tourGroupBox.Controls.Add(this.tourViewHost);
+      this.tourGroupBox.Controls.Add(this.tourGridView);
       this.tourGroupBox.Dock = System.Windows.Forms.DockStyle.Fill;
       this.tourGroupBox.Location = new System.Drawing.Point(3, 3);
       this.tourGroupBox.Name = "tourGroupBox";
-      this.tourGroupBox.Size = new System.Drawing.Size(409, 392);
+      this.tourGroupBox.Size = new System.Drawing.Size(409, 526);
       this.tourGroupBox.TabIndex = 0;
       this.tourGroupBox.TabStop = false;
       this.tourGroupBox.Text = "Tour";
       // 
-      // tourViewHost
+      // tourGridView
       // 
-      this.tourViewHost.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
-                  | System.Windows.Forms.AnchorStyles.Left)
-                  | System.Windows.Forms.AnchorStyles.Right)));
-      this.tourViewHost.Caption = "View";
-      this.tourViewHost.Content = null;
-      this.tourViewHost.Location = new System.Drawing.Point(6, 19);
-      this.tourViewHost.Name = "tourViewHost";
-      this.tourViewHost.ReadOnly = false;
-      this.tourViewHost.Size = new System.Drawing.Size(397, 367);
-      this.tourViewHost.TabIndex = 0;
-      this.tourViewHost.ViewType = null;
+      this.tourGridView.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
+      this.tourGridView.Dock = System.Windows.Forms.DockStyle.Fill;
+      this.tourGridView.Location = new System.Drawing.Point(3, 16);
+      this.tourGridView.Name = "tourGridView";
+      this.tourGridView.Size = new System.Drawing.Size(403, 507);
+      this.tourGridView.TabIndex = 0;
       // 
       // VRPSolutionView
@@ -142 +138 @@
       this.valueTabPage.ResumeLayout(false);
       this.tourGroupBox.ResumeLayout(false);
+      ((System.ComponentModel.ISupportInitialize)(this.tourGridView)).EndInit();
       this.ResumeLayout(false);
 
@@ -153 +150 @@
     private System.Windows.Forms.TabPage valueTabPage;
     private System.Windows.Forms.GroupBox tourGroupBox;
-    private MainForm.WindowsForms.ViewHost tourViewHost;
+    private System.Windows.Forms.DataGridView tourGridView;
 
 

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();
       }
     }

trunk/sources/HeuristicLab.Problems.VehicleRouting.Views/3.3/VehicleRoutingProblemView.Designer.cs

@@ -29 +29 @@
       this.parameterCollectionView = new HeuristicLab.Core.Views.ParameterCollectionView();
       this.tabPage2 = new System.Windows.Forms.TabPage();
+      this.importButton2 = new System.Windows.Forms.Button();
+      this.importButton3 = new System.Windows.Forms.Button();
       this.vrpSolutionView = new HeuristicLab.Problems.VehicleRouting.Views.VRPSolutionView();
       ((System.ComponentModel.ISupportInitialize)(this.errorProvider)).BeginInit();
@@ -43 +45 @@
       // importButton
       // 
-      this.importButton.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
-                  | System.Windows.Forms.AnchorStyles.Right)));
       this.importButton.Location = new System.Drawing.Point(0, 55);
       this.importButton.Name = "importButton";
-      this.importButton.Size = new System.Drawing.Size(490, 23);
+      this.importButton.Size = new System.Drawing.Size(139, 23);
       this.importButton.TabIndex = 5;
       this.importButton.Text = "Import from Solomon";
@@ -63 +63 @@
       this.tabControl1.Name = "tabControl1";
       this.tabControl1.SelectedIndex = 0;
-      this.tabControl1.Size = new System.Drawing.Size(490, 338);
+      this.tabControl1.Size = new System.Drawing.Size(490, 265);
       this.tabControl1.TabIndex = 6;
       // 
@@ -72 +72 @@
       this.tabPage1.Name = "tabPage1";
       this.tabPage1.Padding = new System.Windows.Forms.Padding(3);
-      this.tabPage1.Size = new System.Drawing.Size(482, 312);
+      this.tabPage1.Size = new System.Drawing.Size(482, 239);
       this.tabPage1.TabIndex = 0;
       this.tabPage1.Text = "Parameters";
@@ -85 +85 @@
       this.parameterCollectionView.Name = "parameterCollectionView";
       this.parameterCollectionView.ReadOnly = false;
-      this.parameterCollectionView.Size = new System.Drawing.Size(476, 306);
+      this.parameterCollectionView.Size = new System.Drawing.Size(476, 233);
       this.parameterCollectionView.TabIndex = 1;
       // 
@@ -94 +94 @@
       this.tabPage2.Name = "tabPage2";
       this.tabPage2.Padding = new System.Windows.Forms.Padding(3);
-      this.tabPage2.Size = new System.Drawing.Size(482, 312);
+      this.tabPage2.Size = new System.Drawing.Size(482, 239);
       this.tabPage2.TabIndex = 1;
       this.tabPage2.Text = "Visualization";
       this.tabPage2.UseVisualStyleBackColor = true;
+      // 
+      // importButton2
+      // 
+      this.importButton2.Location = new System.Drawing.Point(145, 55);
+      this.importButton2.Name = "importButton2";
+      this.importButton2.Size = new System.Drawing.Size(126, 23);
+      this.importButton2.TabIndex = 7;
+      this.importButton2.Text = "Import from TSPLib";
+      this.importButton2.UseVisualStyleBackColor = true;
+      this.importButton2.Click += new System.EventHandler(this.importButton2_Click);
+      // 
+      // importButton3
+      // 
+      this.importButton3.Location = new System.Drawing.Point(277, 55);
+      this.importButton3.Name = "importButton3";
+      this.importButton3.Size = new System.Drawing.Size(131, 23);
+      this.importButton3.TabIndex = 8;
+      this.importButton3.Text = "Import from ORLib";
+      this.importButton3.UseVisualStyleBackColor = true;
+      this.importButton3.Click += new System.EventHandler(this.importButton3_Click);
       // 
       // vrpSolutionView
@@ -107 +127 @@
       this.vrpSolutionView.Name = "vrpSolutionView";
       this.vrpSolutionView.ReadOnly = false;
-      this.vrpSolutionView.Size = new System.Drawing.Size(476, 306);
+      this.vrpSolutionView.Size = new System.Drawing.Size(476, 233);
       this.vrpSolutionView.TabIndex = 0;
       // 
@@ -113 +133 @@
       // 
       this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
+      this.Controls.Add(this.importButton3);
+      this.Controls.Add(this.importButton2);
       this.Controls.Add(this.importButton);
       this.Controls.Add(this.tabControl1);
       this.Name = "VehicleRoutingProblemView";
-      this.Size = new System.Drawing.Size(490, 422);
+      this.Size = new System.Drawing.Size(490, 352);
       this.Controls.SetChildIndex(this.tabControl1, 0);
       this.Controls.SetChildIndex(this.importButton, 0);
@@ -123 +145 @@
       this.Controls.SetChildIndex(this.descriptionLabel, 0);
       this.Controls.SetChildIndex(this.descriptionTextBox, 0);
+      this.Controls.SetChildIndex(this.importButton2, 0);
+      this.Controls.SetChildIndex(this.importButton3, 0);
       ((System.ComponentModel.ISupportInitialize)(this.errorProvider)).EndInit();
       this.tabControl1.ResumeLayout(false);
@@ -140 +164 @@
     private Core.Views.ParameterCollectionView parameterCollectionView;
     private VRPSolutionView vrpSolutionView;
+    private System.Windows.Forms.Button importButton2;
+    private System.Windows.Forms.Button importButton3;
   }
 }

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

@@ -64 +64 @@
       parameterCollectionView.Enabled = Content != null;
       vrpSolutionView.Enabled = Content != null;
-      importButton.Enabled = Content != null && !ReadOnly;
+      importButton.Enabled = importButton2.Enabled = importButton3.Enabled = Content != null && !ReadOnly;
     }
 
     private void importButton_Click(object sender, EventArgs e) {
       OpenFileDialog dialog = new OpenFileDialog();
-      dialog.DefaultExt = "txt";
+      dialog.Filter = "Solomon files (*.txt)|*.txt";
 
       if (dialog.ShowDialog() == DialogResult.OK) {
@@ -76 +76 @@
     }
 
+    private void importButton2_Click(object sender, EventArgs e) {
+      OpenFileDialog dialog = new OpenFileDialog();
+      dialog.Filter = "TSPLib files (*.vrp)|*.vrp";
+
+      if (dialog.ShowDialog() == DialogResult.OK) {
+        Content.ImportFromTSPLib(dialog.FileName);
+      }
+    }
+
+    private void importButton3_Click(object sender, EventArgs e) {
+      OpenFileDialog dialog = new OpenFileDialog();
+      dialog.Filter = "ORLib files (*.txt)|*.txt";
+
+      if (dialog.ShowDialog() == DialogResult.OK) {
+        Content.ImportFromORLib(dialog.FileName);
+      }
+    }  
+
     private void CoordinatesParameter_ValueChanged(object sender, EventArgs e) {
       vrpSolutionView.Content.Coordinates = Content.Coordinates;
-    }
+    }  
   }
 }