Changeset 4847 for trunk/sources

Timestamp:

11/19/10 11:12:40 (13 years ago)

Author:

svonolfe

Message:

Implemented review comments (#1236)

Location:

trunk/sources

Files:

• HeuristicLab.Problems.VehicleRouting.Views/3.3/HeuristicLab.Problems.VehicleRouting.Views-3.3.csproj (modified) (1 diff)
• HeuristicLab.Problems.VehicleRouting.Views/3.3/VRPImportDialog.Designer.cs (added)
• HeuristicLab.Problems.VehicleRouting.Views/3.3/VRPImportDialog.cs (added)
• HeuristicLab.Problems.VehicleRouting.Views/3.3/VehicleRoutingProblemView.Designer.cs (modified) (9 diffs)
• HeuristicLab.Problems.VehicleRouting.Views/3.3/VehicleRoutingProblemView.cs (modified) (3 diffs)
• HeuristicLab.Problems.VehicleRouting/3.3/Evaluators/VRPEvaluator.cs (modified) (3 diffs)
• HeuristicLab.Problems.VehicleRouting/3.3/VRPUtilities.cs (modified) (1 diff)
• HeuristicLab.Problems.VehicleRouting/3.3/VehicleRoutingProblem.cs (modified) (6 diffs)

trunk/sources/HeuristicLab.Problems.VehicleRouting.Views/3.3/HeuristicLab.Problems.VehicleRouting.Views-3.3.csproj

@@ -112 +112 @@
   <ItemGroup>
     <Compile Include="HeuristicLabProblemsVehicleRoutingViewsPlugin.cs" />
+    <Compile Include="VRPImportDialog.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="VRPImportDialog.Designer.cs">
+      <DependentUpon>VRPImportDialog.cs</DependentUpon>
+    </Compile>
     <Compile Include="VRPSolutionView.cs">
       <SubType>UserControl</SubType>

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.importBestButton = new System.Windows.Forms.Button();
       this.vrpSolutionView = new HeuristicLab.Problems.VehicleRouting.Views.VRPSolutionView();
       ((System.ComponentModel.ISupportInitialize)(this.errorProvider)).BeginInit();
@@ -46 +43 @@
       // 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(139, 23);
+      this.importButton.Size = new System.Drawing.Size(490, 23);
       this.importButton.TabIndex = 5;
-      this.importButton.Text = "Import from Solomon";
+      this.importButton.Text = "Import";
       this.importButton.UseVisualStyleBackColor = true;
       this.importButton.Click += new System.EventHandler(this.importButton_Click);
@@ -61 +60 @@
       this.tabControl1.Controls.Add(this.tabPage1);
       this.tabControl1.Controls.Add(this.tabPage2);
-      this.tabControl1.Location = new System.Drawing.Point(0, 111);
+      this.tabControl1.Location = new System.Drawing.Point(0, 84);
       this.tabControl1.Name = "tabControl1";
       this.tabControl1.SelectedIndex = 0;
-      this.tabControl1.Size = new System.Drawing.Size(490, 255);
+      this.tabControl1.Size = new System.Drawing.Size(490, 278);
       this.tabControl1.TabIndex = 6;
       // 
@@ -73 +72 @@
       this.tabPage1.Name = "tabPage1";
       this.tabPage1.Padding = new System.Windows.Forms.Padding(3);
-      this.tabPage1.Size = new System.Drawing.Size(482, 229);
+      this.tabPage1.Size = new System.Drawing.Size(482, 252);
       this.tabPage1.TabIndex = 0;
       this.tabPage1.Text = "Parameters";
@@ -88 +87 @@
       this.parameterCollectionView.Name = "parameterCollectionView";
       this.parameterCollectionView.ReadOnly = false;
-      this.parameterCollectionView.Size = new System.Drawing.Size(476, 223);
+      this.parameterCollectionView.Size = new System.Drawing.Size(476, 246);
       this.parameterCollectionView.TabIndex = 1;
       // 
@@ -101 +100 @@
       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);
-      // 
-      // importBestButton
-      // 
-      this.importBestButton.Location = new System.Drawing.Point(0, 82);
-      this.importBestButton.Name = "importBestButton";
-      this.importBestButton.Size = new System.Drawing.Size(139, 23);
-      this.importBestButton.TabIndex = 9;
-      this.importBestButton.Text = "Import solution";
-      this.importBestButton.UseVisualStyleBackColor = true;
-      this.importBestButton.Click += new System.EventHandler(this.importBestButton_Click);
       // 
       // vrpSolutionView
@@ -146 +115 @@
       // 
       this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
-      this.Controls.Add(this.importBestButton);
-      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, 369);
+      this.Size = new System.Drawing.Size(490, 365);
       this.Controls.SetChildIndex(this.tabControl1, 0);
       this.Controls.SetChildIndex(this.importButton, 0);
@@ -159 +125 @@
       this.Controls.SetChildIndex(this.descriptionLabel, 0);
       this.Controls.SetChildIndex(this.descriptionTextBox, 0);
-      this.Controls.SetChildIndex(this.importButton2, 0);
-      this.Controls.SetChildIndex(this.importButton3, 0);
-      this.Controls.SetChildIndex(this.importBestButton, 0);
       ((System.ComponentModel.ISupportInitialize)(this.errorProvider)).EndInit();
       this.tabControl1.ResumeLayout(false);
@@ -179 +142 @@
     private Core.Views.ParameterCollectionView parameterCollectionView;
     private VRPSolutionView vrpSolutionView;
-    private System.Windows.Forms.Button importButton2;
-    private System.Windows.Forms.Button importButton3;
-    private System.Windows.Forms.Button importBestButton;
   }
 }

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

@@ -27 +27 @@
 using HeuristicLab.MainForm;
 using HeuristicLab.Parameters;
+using HeuristicLab.PluginInfrastructure;
 
 namespace HeuristicLab.Problems.VehicleRouting.Views {
@@ -32 +33 @@
   [Content(typeof(VehicleRoutingProblem), true)]
   public partial class VehicleRoutingProblemView : NamedItemView {
+    private VRPImportDialog vrpImportDialog;
+    
     public new VehicleRoutingProblem Content {
       get { return (VehicleRoutingProblem)base.Content; }
@@ -67 +70 @@
       parameterCollectionView.Enabled = Content != null;
       vrpSolutionView.Enabled = Content != null;
-      importBestButton.Enabled = importButton.Enabled = importButton2.Enabled = importButton3.Enabled = Content != null && !ReadOnly;
+      importButton.Enabled = Content != null && !ReadOnly;
     }
 
     private void importButton_Click(object sender, EventArgs e) {
-      OpenFileDialog dialog = new OpenFileDialog();
-      dialog.Filter = "Solomon files (*.txt)|*.txt";
+      if (vrpImportDialog == null) vrpImportDialog = new VRPImportDialog();
 
-      if (dialog.ShowDialog() == DialogResult.OK) {
-        Content.ImportFromSolomon(dialog.FileName);
+      if (vrpImportDialog.ShowDialog(this) == DialogResult.OK) {
+        try {
+          switch (vrpImportDialog.Format) {
+            case VRPFormat.TSPLib:
+              Content.ImportFromTSPLib(vrpImportDialog.VRPFileName);
+              break;
+
+            case VRPFormat.Solomon:
+              Content.ImportFromSolomon(vrpImportDialog.VRPFileName);
+              break;
+
+            case VRPFormat.ORLib:
+              Content.ImportFromORLib(vrpImportDialog.VRPFileName);
+              break;
+          }
+
+          if(!string.IsNullOrEmpty(vrpImportDialog.TourFileName))
+            Content.ImportSolution(vrpImportDialog.TourFileName);
+         }
+        catch (Exception ex) {
+          ErrorHandling.ShowErrorDialog(this, ex);
+        }
       }
     }
-
-    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 importBestButton_Click(object sender, EventArgs e) {
-      OpenFileDialog dialog = new OpenFileDialog();
-      dialog.Filter = "VRP solution files (*.opt)|*.opt";
-
-      if (dialog.ShowDialog() == DialogResult.OK) {
-        Content.ImportSolution(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) {

trunk/sources/HeuristicLab.Problems.VehicleRouting/3.3/Evaluators/VRPEvaluator.cs

@@ -116 +116 @@
       DoubleArray serviceTimeArray, DoubleArray readyTimeArray, DoubleArray demandArray, DoubleValue capacity,
       DoubleValue fleetUsageFactor, DoubleValue timeFactor, DoubleValue distanceFactor, DoubleValue overloadPenalty, DoubleValue tardinessPenalty,
-      DoubleMatrix coordinates, ILookupParameter<DoubleMatrix> distanceMatrix, BoolValue useDistanceMatrix) {
+      DoubleMatrix coordinates, IParameter distanceMatrix, BoolValue useDistanceMatrix) {
       TourEvaluation eval = new TourEvaluation();
 
@@ -190 +190 @@
       DoubleArray serviceTimeArray, DoubleArray readyTimeArray, DoubleArray demandArray, DoubleValue capacity,
       DoubleValue fleetUsageFactor, DoubleValue timeFactor, DoubleValue distanceFactor, DoubleValue overloadPenalty, DoubleValue tardinessPenalty,
-      DoubleMatrix coordinates, ILookupParameter<DoubleMatrix> distanceMatrix, BoolValue useDistanceMatrix) {
+      DoubleMatrix coordinates, IParameter distanceMatrix, BoolValue useDistanceMatrix) {
       TourEvaluation sumEval = new TourEvaluation();
       sumEval.Distance = 0;
@@ -199 +199 @@
       sumEval.Tardiness = 0;
 
-      foreach (Tour tour in solution.GetTours(distanceMatrix)) {
+      foreach (Tour tour in solution.GetTours(distanceMatrix as ILookupParameter<DoubleMatrix>)) {
         TourEvaluation eval = EvaluateTour(tour, dueTimeArray, serviceTimeArray, readyTimeArray, demandArray, capacity,
           fleetUsageFactor, timeFactor, distanceFactor, overloadPenalty, tardinessPenalty,

trunk/sources/HeuristicLab.Problems.VehicleRouting/3.3/VRPUtilities.cs

@@ -57 +57 @@
 
       if (useDistanceMatrix.Value) {
-        if (distanceMatrix is IValueLookupParameter<DoubleMatrix>) {
-          if ((distanceMatrix as IValueLookupParameter<DoubleMatrix>).Value == null) {
-            (distanceMatrix as IValueLookupParameter<DoubleMatrix>).Value = CreateDistanceMatrix(coordinates);
+        if (distanceMatrix is IValueParameter<DoubleMatrix>) {
+          if ((distanceMatrix as IValueParameter<DoubleMatrix>).Value == null) {
+            (distanceMatrix as IValueParameter<DoubleMatrix>).Value = CreateDistanceMatrix(coordinates);
           }
           
-          distance = (distanceMatrix as IValueLookupParameter<DoubleMatrix>).Value[start, end];
+          distance = (distanceMatrix as IValueParameter<DoubleMatrix>).Value[start, end];
         } else {
           if (distanceMatrix.ActualValue == null) {

trunk/sources/HeuristicLab.Problems.VehicleRouting/3.3/VehicleRoutingProblem.cs

@@ -620 +620 @@
       this.Name = parser.ProblemName;
 
+      BestKnownSolution = null;
       Coordinates = new DoubleMatrix(parser.Coordinates);
       Vehicles.Value = parser.Vehicles;
@@ -636 +637 @@
 
       this.Name = parser.Name;
-
       int problemSize = parser.Demands.Length;
 
+      BestKnownSolution = null;
       Coordinates = new DoubleMatrix(parser.Vertices);
       if (parser.Vehicles != -1)
@@ -661 +662 @@
 
       if (parser.Depot != 1)
-        throw new Exception("Invalid depot specification");
+        ErrorHandling.ShowErrorDialog(new Exception("Invalid depot specification"));
 
       if (parser.WeightType != TSPLIBParser.TSPLIBEdgeWeightType.EUC_2D)
-        throw new Exception("Invalid weight type");
+        ErrorHandling.ShowErrorDialog(new Exception("Invalid weight type"));
 
       OnReset();
@@ -672 +673 @@
       if (BestKnownSolution != null) {
         //call evaluator
-        IValueLookupParameter<DoubleMatrix> distMatrix = new ValueLookupParameter<DoubleMatrix>("DistMatrix",
+        IValueParameter<DoubleMatrix> distMatrix = new ValueParameter<DoubleMatrix>("DistMatrix",
           DistanceMatrix);
 
@@ -716 +717 @@
 
       if (cities != Coordinates.Rows - 1)
-        throw new Exception("Invalid solution");
-
-      BestKnownSolutionParameter.Value = encoding;
+        ErrorHandling.ShowErrorDialog(new Exception("Invalid solution"));
+      else
+        BestKnownSolutionParameter.Value = encoding;
     }
 
@@ -728 +729 @@
       int problemSize = parser.Demands.Length;
 
+      BestKnownSolution = null;
       Coordinates = new DoubleMatrix(parser.Vertices);
       Vehicles.Value = problemSize - 1;