Changeset 4315 for branches/VRP

Timestamp:

08/25/10 13:50:51 (14 years ago)

Author:

svonolfe

Message:

Added ORLIBParser (#1039)

Location:

branches/VRP

Files:

• HeuristicLab.Problems.VehicleRouting.Views/3.3/VehicleRoutingProblemView.Designer.cs (modified) (7 diffs)
• HeuristicLab.Problems.VehicleRouting.Views/3.3/VehicleRoutingProblemView.cs (modified) (3 diffs)
• HeuristicLab.Problems.VehicleRouting/3.3/HeuristicLab.Problems.VehicleRouting-3.3.csproj (modified) (1 diff)
• HeuristicLab.Problems.VehicleRouting/3.3/ORLIBParser.cs (added)
• HeuristicLab.Problems.VehicleRouting/3.3/VehicleRoutingProblem.cs (modified) (1 diff)

branches/VRP/HeuristicLab.Problems.VehicleRouting.Views/3.3/VehicleRoutingProblemView.Designer.cs

@@ -31 +31 @@
       this.vrpSolutionView = new HeuristicLab.Problems.VehicleRouting.Views.VRPSolutionView();
       this.importButton2 = new System.Windows.Forms.Button();
+      this.importButton3 = new System.Windows.Forms.Button();
       ((System.ComponentModel.ISupportInitialize)(this.errorProvider)).BeginInit();
       this.tabControl1.SuspendLayout();
@@ -61 +62 @@
       this.tabControl1.Controls.Add(this.tabPage1);
       this.tabControl1.Controls.Add(this.tabPage2);
-      this.tabControl1.Location = new System.Drawing.Point(0, 109);
+      this.tabControl1.Location = new System.Drawing.Point(0, 139);
       this.tabControl1.Name = "tabControl1";
       this.tabControl1.SelectedIndex = 0;
-      this.tabControl1.Size = new System.Drawing.Size(490, 313);
+      this.tabControl1.Size = new System.Drawing.Size(490, 283);
       this.tabControl1.TabIndex = 6;
       // 
@@ -73 +74 @@
       this.tabPage1.Name = "tabPage1";
       this.tabPage1.Padding = new System.Windows.Forms.Padding(3);
-      this.tabPage1.Size = new System.Drawing.Size(482, 287);
+      this.tabPage1.Size = new System.Drawing.Size(482, 257);
       this.tabPage1.TabIndex = 0;
       this.tabPage1.Text = "Parameters";
@@ -86 +87 @@
       this.parameterCollectionView.Name = "parameterCollectionView";
       this.parameterCollectionView.ReadOnly = false;
-      this.parameterCollectionView.Size = new System.Drawing.Size(476, 281);
+      this.parameterCollectionView.Size = new System.Drawing.Size(476, 251);
       this.parameterCollectionView.TabIndex = 1;
       // 
@@ -123 +124 @@
       this.importButton2.Click += new System.EventHandler(this.importButton2_Click);
       // 
+      // importButton3
+      // 
+      this.importButton3.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
+                  | System.Windows.Forms.AnchorStyles.Right)));
+      this.importButton3.Location = new System.Drawing.Point(0, 110);
+      this.importButton3.Name = "importButton3";
+      this.importButton3.Size = new System.Drawing.Size(490, 23);
+      this.importButton3.TabIndex = 8;
+      this.importButton3.Text = "Import from ORLib";
+      this.importButton3.UseVisualStyleBackColor = true;
+      this.importButton3.Click += new System.EventHandler(this.importButton3_Click);
+      // 
       // VehicleRoutingProblemView
       // 
       this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
+      this.Controls.Add(this.importButton3);
       this.Controls.Add(this.importButton2);
       this.Controls.Add(this.importButton);
@@ -138 +152 @@
       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);
@@ -156 +171 @@
     private VRPSolutionView vrpSolutionView;
     private System.Windows.Forms.Button importButton2;
+    private System.Windows.Forms.Button importButton3;
   }
 }

branches/VRP/HeuristicLab.Problems.VehicleRouting.Views/3.3/VehicleRoutingProblemView.cs

@@ -69 +69 @@
     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) {
@@ -78 +78 @@
     private void importButton2_Click(object sender, EventArgs e) {
       OpenFileDialog dialog = new OpenFileDialog();
-      dialog.DefaultExt = "vrp";
+      dialog.DefaultExt = "TSPLib files (*.vrp)|*.vrp";
 
       if (dialog.ShowDialog() == DialogResult.OK) {
@@ -85 +85 @@
     }
 
+    private void importButton3_Click(object sender, EventArgs e) {
+      OpenFileDialog dialog = new OpenFileDialog();
+      dialog.DefaultExt = "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;
-    }    
+    }  
   }
 }

branches/VRP/HeuristicLab.Problems.VehicleRouting/3.3/HeuristicLab.Problems.VehicleRouting-3.3.csproj

@@ -179 +179 @@
     <Compile Include="Encodings\Zhu\ZhuEncoding.cs" />
     <Compile Include="Interfaces\IVRPMoveMaker.cs" />
+    <Compile Include="ORLIBParser.cs" />
     <Compile Include="TSPLIBParser.cs" />
     <Compile Include="VRPUtilities.cs" />

branches/VRP/HeuristicLab.Problems.VehicleRouting/3.3/VehicleRoutingProblem.cs

@@ -483 +483 @@
     }
 
+    public void ImportFromORLib(string orFileName) {
+      ORLIBParser parser = new ORLIBParser(orFileName);
+      parser.Parse();
+
+      this.Name = parser.Name;
+      int problemSize = parser.Demands.Length;
+
+      Coordinates = new DoubleMatrix(parser.Vertices);
+      Vehicles.Value = problemSize - 1;
+      Capacity.Value = parser.Capacity;
+      Demand = new DoubleArray(parser.Demands);
+      ReadyTime = new DoubleArray(problemSize);
+      DueTime = new DoubleArray(problemSize);
+      ServiceTime = new DoubleArray(problemSize);
+
+      ReadyTime[0] = 0;
+      DueTime[0] = parser.MaxRouteTime;
+      ServiceTime[0] = 0;
+
+      for (int i = 1; i < problemSize; i++) {
+        ReadyTime[i] = 0;
+        DueTime[i] = int.MaxValue;
+        ServiceTime[i] = parser.ServiceTime;
+      }
+
+      OnReset();
+    }
+
     private void InitializeRandomVRPInstance() {
       System.Random rand = new System.Random();