Context Navigation

← Previous Change
Next Change →

HeuristicLab.Problems.Instances.TSPLIB.Views

Timestamp:

07/18/14 12:35:00 (10 years ago)

Author:

ascheibe

Message:

reverted last commit

Location:

branches/HiveStatistics/sources

Files:

: 8 edited

. (modified) (2 props)
HeuristicLab.Problems.Instances.TSPLIB.Views (modified) (1 prop)
HeuristicLab.Problems.Instances.TSPLIB.Views/3.3/Plugin.cs.frame (modified) (2 diffs)
HeuristicLab.Problems.Instances.TSPLIB.Views/3.3/Properties/AssemblyInfo.cs.frame (modified) (3 diffs)
HeuristicLab.Problems.Instances.TSPLIB.Views/3.3/TSPLIBImportDialog.Designer.cs (modified) (1 diff)
HeuristicLab.Problems.Instances.TSPLIB.Views/3.3/TSPLIBImportDialog.cs (modified) (1 diff)
HeuristicLab.Problems.Instances.TSPLIB.Views/3.3/TSPLIBTSPInstanceProviderView.Designer.cs (modified) (1 diff)
HeuristicLab.Problems.Instances.TSPLIB.Views/3.3/TSPLIBTSPInstanceProviderView.cs (modified) (3 diffs)

Legend:

: Unmodified
: Added
: Removed

branches/HiveStatistics/sources

Property svn:ignore

-                      old
+                      new
 FxCopResults.txt
 Google.ProtocolBuffers-0.9.1.dll
-Google.ProtocolBuffers-2.4.1.473.dll
 HeuristicLab 3.3.5.1.ReSharper.user
 HeuristicLab 3.3.6.0.ReSharper.user
 HeuristicLab.4.5.resharper.user
 HeuristicLab.ExtLibs.6.0.ReSharper.user
-HeuristicLab.Scripting.Development
 HeuristicLab.resharper.user
 ProtoGen.exe
 …
 _ReSharper.HeuristicLab
 _ReSharper.HeuristicLab 3.3
-_ReSharper.HeuristicLab 3.3 Tests
 _ReSharper.HeuristicLab.ExtLibs
 bin
 protoc.exe
+_ReSharper.HeuristicLab 3.3 Tests
+Google.ProtocolBuffers-2.4.1.473.dll

Property svn:mergeinfo changed

/trunk/sources		reverse-merged: 9445,9447-9459,9462-9466,9471-9472,9474,9476-9479,9493,9496,9498,9504-9506,9515-9517,9520-9521,9523,9530-9531,9534-9537,9540,9542-9544,9552-9555,9568-9569,9587,9590-9592,9600,9607-9608,9610-9611,9613,9618,9623-9624,9626,9647-9649,9652,9657-9660,9664-9666,9675,9692,9695,9699,9702,9710,9714,9718-9720,9740-9741,9751,9755,9762,9764-9775,9777-9778,9782-9786,9792,9794,9801-9807,9809-9812,9816-9817,9819-9822,9824-9825,9828,9830,9833,9837-9841,9845,9848-9851,9855,9859-9860,9863,9865-9868,9871,9893-9897,9900-9902,9905-9907,9910,9915-9916,9919-9921,9928,9930,9934-9935,9938-9941,9944,9946,9949,9955-9956,9958-9959,9964-9965,9973-9975,9978,9980-9982,9988-9989,9991-9992,9994-9995,9997,10000-10004,10009-10010,10015,10037,10130,10149-10150,10154,10170-10171,10173-10176,10195-10196,10212-10213,10231,10261,10273,10291-10292,10295,10298,10323-10324,10346,10348,10355,10359-10360,10362-10363,10365-10366,10368,10375,10378,10391,10401,10406-10407,10414,10417-10418,10428,10432-10433,10435,10440,10448,10453,10460,10465-10466,10469-10470,10472,10474-10477,10480,10484,10486,10488-10500,10503-10504,10506,10510-10512,10520-10523,10526,10531,10540-10541,10543,10545,10561-10566,10575-10578,10596-10597,10599,10601-10607,10639,10642-10643,10646,10651-10653,10727,10731,10745,10747,10761,10767,10774,10787-10791,10793-10794,10796,10799-10800,10826,10857-10862,10865,10885,10889,10894-10896,10924,10926-10927,10937,10941,10953,10955-10956,10958-10961,10963,10975,10983-10986,10988-10989,10996,11007-11008,11012-11014,11019,11024-11027,11031,11034-11035,11048,11050-11052,11056-11058,11060,11065-11067,11071,11074-11082,11086-11088,11091-11093,11095-11097,11099,11102,11108,11111-11117,11123-11128,11131,11135,11153,11156,11161,11163,11171-11172,11174,11176
/branches/1721-RandomForestPersistence	removed
/branches/DataPreprocessing	removed
/branches/HLScript	removed
/branches/HeuristicLab.Problems.DataAnalysis.Trading	removed
/branches/LogResidualEvaluator	removed
/branches/SpectralKernelForGaussianProcesses	removed
/stable	removed

branches/HiveStatistics/sources/HeuristicLab.Problems.Instances.TSPLIB.Views
- Property svn:mergeinfo changed
  /stable/HeuristicLab.Problems.Instances.TSPLIB.Views removed
  /trunk/sources/HeuristicLab.Problems.Instances.TSPLIB.Views removed

branches/HiveStatistics/sources/HeuristicLab.Problems.Instances.TSPLIB.Views/3.3/Plugin.cs.frame

-                      r11202
+                      r11203
 #region License Information
 /* HeuristicLab
  * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ *
  * This file is part of HeuristicLab.
 …
 namespace HeuristicLab.Problems.Instances.TSPLIB.Views {
   [Plugin("HeuristicLab.Problems.Instances.TSPLIB.Views", "3.3.10.$WCREV$")]
+  [Plugin("HeuristicLab.Problems.Instances.TSPLIB.Views", "3.3.7.$WCREV$")]
   [PluginFile("HeuristicLab.Problems.Instances.TSPLIB.Views-3.3.dll", PluginFileType.Assembly)]
   [PluginDependency("HeuristicLab.Common.Resources", "3.3")]

branches/HiveStatistics/sources/HeuristicLab.Problems.Instances.TSPLIB.Views/3.3/Properties/AssemblyInfo.cs.frame

-                      r11202
+                      r11203
 #region License Information
 /* HeuristicLab
  * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ *
  * This file is part of HeuristicLab.
 …
 [assembly: AssemblyCompany("HEAL")]
 [assembly: AssemblyProduct("HeuristicLab")]
 [assembly: AssemblyCopyright("(c) 2002-2014 HEAL")]
+[assembly: AssemblyCopyright("(c) 2002-2012 HEAL")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 …
 // [assembly: AssemblyVersion("1.0.*")]
 [assembly: AssemblyVersion("3.3.0.0")]
 [assembly: AssemblyFileVersion("3.3.10.$WCREV$")]
+[assembly: AssemblyFileVersion("3.3.7.$WCREV$")]

branches/HiveStatistics/sources/HeuristicLab.Problems.Instances.TSPLIB.Views/3.3/TSPLIBImportDialog.Designer.cs

r11202	r11203
1	1	#region License Information
2	2	/* HeuristicLab
3		* Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
	3	* Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
4	4	*
5	5	* This file is part of HeuristicLab.

branches/HiveStatistics/sources/HeuristicLab.Problems.Instances.TSPLIB.Views/3.3/TSPLIBImportDialog.cs

r11202	r11203
1	1	#region License Information
2	2	/* HeuristicLab
3		* Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
	3	* Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
4	4	*
5	5	* This file is part of HeuristicLab.

branches/HiveStatistics/sources/HeuristicLab.Problems.Instances.TSPLIB.Views/3.3/TSPLIBTSPInstanceProviderView.Designer.cs

r11202	r11203
1	1	#region License Information
2	2	/* HeuristicLab
3		* Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
	3	* Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
4	4	*
5	5	* This file is part of HeuristicLab.

branches/HiveStatistics/sources/HeuristicLab.Problems.Instances.TSPLIB.Views/3.3/TSPLIBTSPInstanceProviderView.cs

-                      r11202
+                      r11203
 #region License Information
 /* HeuristicLab
  * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ *
  * This file is part of HeuristicLab.
 …
 using System.Windows.Forms;
 using HeuristicLab.MainForm;
+using HeuristicLab.MainForm.WindowsForms;
 using HeuristicLab.Problems.Instances.Views;
 namespace HeuristicLab.Problems.Instances.TSPLIB.Views {
   [View("TSPLIB TSP InstanceProvider View")]
   [Content(typeof(TSPLIBTSPInstanceProvider), IsDefaultView = true)]
   public partial class TSPLIBTSPInstanceProviderView : ProblemInstanceProviderView<TSPData> {
     public new TSPLIBTSPInstanceProvider Content {
       get { return (TSPLIBTSPInstanceProvider)base.Content; }
+  [Content(typeof(IProblemInstanceConsumer<TSPData>), IsDefaultView = true)]
+  public partial class TSPLIBTSPInstanceProviderView : ProblemInstanceConsumerViewGeneric<TSPData> {
+    public new IProblemInstanceConsumer<TSPData> Content {
+      get { return (IProblemInstanceConsumer<TSPData>)base.Content; }
       set { base.Content = value; }
+    }
 …
     protected override void importButton_Click(object sender, EventArgs e) {
+      using (var dialog = new TSPLIBImportDialog()) {
+        if (dialog.ShowDialog() == DialogResult.OK) {
+          var instance = Content.LoadData(dialog.TSPFileName, dialog.TourFileName, dialog.Quality);
+          try {
+            GenericConsumer.Load(instance);
+            instancesComboBox.SelectedIndex = -1;
+          } catch (Exception ex) {
+            MessageBox.Show(String.Format("This problem does not support loading the instance {0}: {1}", Path.GetFileName(openFileDialog.FileName), Environment.NewLine + ex.Message), "Cannot load instance");
+      TSPLIBTSPInstanceProvider provider = SelectedProvider as TSPLIBTSPInstanceProvider;
+      if (provider != null) {
+        using (var dialog = new TSPLIBImportDialog()) {
+          if (dialog.ShowDialog() == DialogResult.OK) {
+            var instance = provider.LoadData(dialog.TSPFileName, dialog.TourFileName, dialog.Quality);
+            try {
+              GenericConsumer.Load(instance);
+            }
+            catch (Exception ex) {
+              MessageBox.Show(String.Format("This problem does not support loading the instance {0}: {1}", Path.GetFileName(openFileDialog.FileName), Environment.NewLine + ex.Message), "Cannot load instance");
+            }
+          }
+        }
+      } else {
+        base.importButton_Click(sender, e);
+      }
+    }

Note: See TracChangeset for help on using the changeset viewer.

/stable/HeuristicLab.Problems.Instances.TSPLIB.Views	removed
/trunk/sources/HeuristicLab.Problems.Instances.TSPLIB.Views	removed

Context Navigation

Changeset 11203 for branches/HiveStatistics/sources/HeuristicLab.Problems.Instances.TSPLIB.Views

Legend:

Download in other formats: