Changeset 7882

Timestamp:

05/23/12 17:41:54 (12 years ago)

Author:

svonolfe

Message:

Incorporated review comments of abeham (#1177)

Location:

branches/VRP

Files:

• HeuristicLab.Problems.Instances.VehicleRouting.Views/3.4/VRPImportDialog.Designer.cs (modified) (2 diffs)
• HeuristicLab.Problems.Instances.VehicleRouting.Views/3.4/VRPImportDialog.cs (modified) (1 diff)
• HeuristicLab.Problems.Instances.VehicleRouting.Views/3.4/VRPInstanceProviderView.cs (modified) (1 diff)
• HeuristicLab.Problems.Instances.VehicleRouting/3.4/CordeauFormat (added)
• HeuristicLab.Problems.Instances.VehicleRouting/3.4/CordeauFormat/CordeauFormatInstanceProvider.cs (moved) (moved from branches/VRP/HeuristicLab.Problems.Instances.VehicleRouting/3.4/CordeauFormatInstanceProvider.cs)
• HeuristicLab.Problems.Instances.VehicleRouting/3.4/CordeauFormat/CordeauInstanceProvider.cs (moved) (moved from branches/VRP/HeuristicLab.Problems.Instances.VehicleRouting/3.4/CordeauInstanceProvider.cs) (1 diff)
• HeuristicLab.Problems.Instances.VehicleRouting/3.4/CordeauFormat/CordeauParser.cs (copied) (copied from branches/VRP/HeuristicLab.Problems.Instances.VehicleRouting/3.4/Parsers/CordeauParser.cs)
• HeuristicLab.Problems.Instances.VehicleRouting/3.4/HeuristicLab.Problems.Instances.VehicleRouting-3.4.csproj (modified) (1 diff)
• HeuristicLab.Problems.Instances.VehicleRouting/3.4/LiLimFormat (added)
• HeuristicLab.Problems.Instances.VehicleRouting/3.4/LiLimFormat/LiLimFormatInstanceProvider.cs (moved) (moved from branches/VRP/HeuristicLab.Problems.Instances.VehicleRouting/3.4/LiLimFormatInstanceProvider.cs)
• HeuristicLab.Problems.Instances.VehicleRouting/3.4/LiLimFormat/LiLimInstanceProvider.cs (moved) (moved from branches/VRP/HeuristicLab.Problems.Instances.VehicleRouting/3.4/LiLimInstanceProvider.cs) (1 diff)
• HeuristicLab.Problems.Instances.VehicleRouting/3.4/LiLimFormat/LiLimParser.cs (copied) (copied from branches/VRP/HeuristicLab.Problems.Instances.VehicleRouting/3.4/Parsers/LiLimParser.cs)
• HeuristicLab.Problems.Instances.VehicleRouting/3.4/Parsers (deleted)
• HeuristicLab.Problems.Instances.VehicleRouting/3.4/SolomonFormat (added)
• HeuristicLab.Problems.Instances.VehicleRouting/3.4/SolomonFormat/HombergerInstanceProvider.cs (moved) (moved from branches/VRP/HeuristicLab.Problems.Instances.VehicleRouting/3.4/HombergerInstanceProvider.cs) (1 diff)
• HeuristicLab.Problems.Instances.VehicleRouting/3.4/SolomonFormat/SolomonFormatInstanceProvider.cs (moved) (moved from branches/VRP/HeuristicLab.Problems.Instances.VehicleRouting/3.4/SolomonFormatInstanceProvider.cs)
• HeuristicLab.Problems.Instances.VehicleRouting/3.4/SolomonFormat/SolomonInstanceProvider.cs (moved) (moved from branches/VRP/HeuristicLab.Problems.Instances.VehicleRouting/3.4/SolomonInstanceProvider.cs) (1 diff)
• HeuristicLab.Problems.Instances.VehicleRouting/3.4/SolomonFormat/SolomonParser.cs (copied) (copied from branches/VRP/HeuristicLab.Problems.Instances.VehicleRouting/3.4/Parsers/SolomonParser.cs)
• HeuristicLab.Problems.Instances.VehicleRouting/3.4/TSPLibFormat (added)
• HeuristicLab.Problems.Instances.VehicleRouting/3.4/TSPLibFormat/AugeratInstanceProvider.cs (moved) (moved from branches/VRP/HeuristicLab.Problems.Instances.VehicleRouting/3.4/AugeratInstanceProvider.cs) (1 diff)
• HeuristicLab.Problems.Instances.VehicleRouting/3.4/TSPLibFormat/ChristofidesEilonInstanceProvider.cs (moved) (moved from branches/VRP/HeuristicLab.Problems.Instances.VehicleRouting/3.4/ChristofidesEilonInstanceProvider.cs) (1 diff)
• HeuristicLab.Problems.Instances.VehicleRouting/3.4/TSPLibFormat/TSPLibFormatInstanceProvider.cs (moved) (moved from branches/VRP/HeuristicLab.Problems.Instances.VehicleRouting/3.4/TSPLibFormatInstanceProvider.cs)

branches/VRP/HeuristicLab.Problems.Instances.VehicleRouting.Views/3.4/VRPImportDialog.Designer.cs

@@ -92 +92 @@
       this.tspFileLabel.Size = new System.Drawing.Size(51, 13);
       this.tspFileLabel.TabIndex = 0;
-      this.tspFileLabel.Text = "&VRP File:";
+      this.tspFileLabel.Text = "&Problem File:";
       // 
       // openVRPFileButton
@@ -123 +123 @@
       this.tourFileLabel.Size = new System.Drawing.Size(119, 13);
       this.tourFileLabel.TabIndex = 5;
-      this.tourFileLabel.Text = "&Optimal VRP Tours File:";
+      this.tourFileLabel.Text = "&Optimal Tours File:";
       // 
       // openTourFileButton

branches/VRP/HeuristicLab.Problems.Instances.VehicleRouting.Views/3.4/VRPImportDialog.cs

@@ -37 +37 @@
     }
 
-    public VRPImportDialog() {
+    public VRPImportDialog(string format) {
       InitializeComponent();
       vrpFileName = string.Empty;
       tourFileName = string.Empty;
+      Text += " in " + format + " Format";
     }
 

branches/VRP/HeuristicLab.Problems.Instances.VehicleRouting.Views/3.4/VRPInstanceProviderView.cs

@@ -42 +42 @@
 
     protected override void importButton_Click(object sender, EventArgs e) {
-      using (var dialog = new VRPImportDialog()) {
+      using (var dialog = new VRPImportDialog(Content.Name)) {
         if (dialog.ShowDialog() == DialogResult.OK) {
           var instance = Content.LoadData(dialog.VRPFileName, dialog.TourFileName);

branches/VRP/HeuristicLab.Problems.Instances.VehicleRouting/3.4/CordeauFormat/CordeauInstanceProvider.cs

@@ -43 +43 @@
 
     public override string ReferencePublication {
-      get { return "none"; }
+      get { return null; }
     }
 

branches/VRP/HeuristicLab.Problems.Instances.VehicleRouting/3.4/HeuristicLab.Problems.Instances.VehicleRouting-3.4.csproj

@@ -120 +120 @@
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="AugeratInstanceProvider.cs" />
-    <Compile Include="ChristofidesEilonInstanceProvider.cs" />
-    <Compile Include="CordeauInstanceProvider.cs" />
-    <Compile Include="CordeauFormatInstanceProvider.cs" />
-    <Compile Include="LiLimInstanceProvider.cs" />
-    <Compile Include="LiLimFormatInstanceProvider.cs" />
-    <Compile Include="HombergerInstanceProvider.cs" />
-    <Compile Include="Parsers\LiLimParser.cs" />
-    <Compile Include="Parsers\CordeauParser.cs" />
-    <Compile Include="SolomonInstanceProvider.cs" />
-    <Compile Include="SolomonFormatInstanceProvider.cs" />
-    <Compile Include="Parsers\SolomonParser.cs" />
-    <Compile Include="TSPLibFormatInstanceProvider.cs" />
+    <Compile Include="TSPLibFormat\AugeratInstanceProvider.cs" />
+    <Compile Include="TSPLibFormat\ChristofidesEilonInstanceProvider.cs" />
+    <Compile Include="CordeauFormat\CordeauInstanceProvider.cs" />
+    <Compile Include="CordeauFormat\CordeauFormatInstanceProvider.cs" />
+    <Compile Include="LiLimFormat\LiLimInstanceProvider.cs" />
+    <Compile Include="LiLimFormat\LiLimFormatInstanceProvider.cs" />
+    <Compile Include="SolomonFormat\HombergerInstanceProvider.cs" />
+    <Compile Include="LiLimFormat\LiLimParser.cs" />
+    <Compile Include="CordeauFormat\CordeauParser.cs" />
+    <Compile Include="SolomonFormat\SolomonInstanceProvider.cs" />
+    <Compile Include="SolomonFormat\SolomonFormatInstanceProvider.cs" />
+    <Compile Include="SolomonFormat\SolomonParser.cs" />
+    <Compile Include="TSPLibFormat\TSPLibFormatInstanceProvider.cs" />
     <Compile Include="VRPInstanceProvider.cs" />
     <Compile Include="VRPDataDescriptor.cs" />

branches/VRP/HeuristicLab.Problems.Instances.VehicleRouting/3.4/LiLimFormat/LiLimInstanceProvider.cs

@@ -43 +43 @@
 
     public override string ReferencePublication {
-      get { return "none"; }
+      get { return null; }
     }
 

branches/VRP/HeuristicLab.Problems.Instances.VehicleRouting/3.4/SolomonFormat/HombergerInstanceProvider.cs

@@ -43 +43 @@
 
     public override string ReferencePublication {
-      get { return "none"; }
+      get { return null; }
     }
 

branches/VRP/HeuristicLab.Problems.Instances.VehicleRouting/3.4/SolomonFormat/SolomonInstanceProvider.cs

@@ -43 +43 @@
 
     public override string ReferencePublication {
-      get { return "none"; }
+      get { return null; }
     }
 

branches/VRP/HeuristicLab.Problems.Instances.VehicleRouting/3.4/TSPLibFormat/AugeratInstanceProvider.cs

@@ -43 +43 @@
 
     public override string ReferencePublication {
-      get { return "none"; }
+      get { return null; }
     }
 

branches/VRP/HeuristicLab.Problems.Instances.VehicleRouting/3.4/TSPLibFormat/ChristofidesEilonInstanceProvider.cs

@@ -43 +43 @@
 
     public override string ReferencePublication {
-      get { return "none"; }
+      get { return null; }
     }