Changeset 3151 for trunk/sources/HeuristicLab.Problems.TSP.Views/3.3/TSPView.cs

Timestamp:

03/21/10 23:55:23 (14 years ago)

Author:

swagner

Message:

Implemented import of optimal TSP solutions (#924).

File:

• trunk/sources/HeuristicLab.Problems.TSP.Views/3.3/TSPView.cs (modified) (2 diffs)

trunk/sources/HeuristicLab.Problems.TSP.Views/3.3/TSPView.cs

@@ -33 +33 @@
   [Content(typeof(TSP), true)]
   public sealed partial class TSPView : ProblemView {
+    private TSPLIBImportDialog tsplibImportDialog;
+
     public new TSP Content {
       get { return (TSP)base.Content; }
@@ -63 +65 @@
 
     private void importButton_Click(object sender, System.EventArgs e) {
-      if (openFileDialog.ShowDialog(this) == DialogResult.OK) {
+      if (tsplibImportDialog == null) tsplibImportDialog = new TSPLIBImportDialog();
+
+      if (tsplibImportDialog.ShowDialog(this) == DialogResult.OK) {
         try {
-          Content.ImportFromTSPLIB(openFileDialog.FileName);
+          if (tsplibImportDialog.Quality == null)
+            Content.ImportFromTSPLIB(tsplibImportDialog.TSPFileName, tsplibImportDialog.TourFileName);
+          else
+            Content.ImportFromTSPLIB(tsplibImportDialog.TSPFileName, tsplibImportDialog.TourFileName, (double)tsplibImportDialog.Quality);
         }
         catch (Exception ex) {