Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
05/15/12 13:54:24 (12 years ago)
Author:
sforsten
Message:

#1784: merge branch ProblemInstancesRegressionAndClassification into trunk

Location:
trunk/sources
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/sources

  • trunk/sources/HeuristicLab.Problems.Instances.TSPLIB.Views

    • Property svn:mergeinfo set to (toggle deleted branches)
      /branches/ProblemInstancesRegressionAndClassification/HeuristicLab.Problems.Instances.TSPLIB.Viewsmergedeligible
      /branches/Benchmarking/sources/HeuristicLab.Problems.Instances.TSPLIB.Views6917-7005
      /branches/CloningRefactoring/HeuristicLab.Problems.Instances.TSPLIB.Views4656-4721
      /branches/DataAnalysis Refactoring/HeuristicLab.Problems.Instances.TSPLIB.Views5471-5808
      /branches/DataAnalysis SolutionEnsembles/HeuristicLab.Problems.Instances.TSPLIB.Views5815-6180
      /branches/DataAnalysis/HeuristicLab.Problems.Instances.TSPLIB.Views4458-4459,​4462,​4464
      /branches/GP.Grammar.Editor/HeuristicLab.Problems.Instances.TSPLIB.Views6284-6795
      /branches/GP.Symbols (TimeLag, Diff, Integral)/HeuristicLab.Problems.Instances.TSPLIB.Views5060
      /branches/NET40/sources/HeuristicLab.Problems.Instances.TSPLIB.Views5138-5162
      /branches/ParallelEngine/HeuristicLab.Problems.Instances.TSPLIB.Views5175-5192
      /branches/QAPAlgorithms/HeuristicLab.Problems.Instances.TSPLIB.Views6350-6627
      /branches/Restructure trunk solution/HeuristicLab.Problems.Instances.TSPLIB.Views6828
      /branches/SuccessProgressAnalysis/HeuristicLab.Problems.Instances.TSPLIB.Views5370-5682
      /branches/Trunk/HeuristicLab.Problems.Instances.TSPLIB.Views6829-6865
      /branches/VNS/HeuristicLab.Problems.Instances.TSPLIB.Views5594-5752
      /branches/histogram/HeuristicLab.Problems.Instances.TSPLIB.Views5959-6341
  • trunk/sources/HeuristicLab.Problems.Instances.TSPLIB.Views/3.3/TSPLIBTSPInstanceProviderView.cs

    r7558 r7823  
    2424using HeuristicLab.MainForm;
    2525using HeuristicLab.MainForm.WindowsForms;
    26 using HeuristicLab.Optimization.Views;
     26using HeuristicLab.Problems.Instances.Views;
     27using System.IO;
    2728
    2829namespace HeuristicLab.Problems.Instances.TSPLIB.Views {
    2930  [View("TSPLIB TSP InstanceProvider View")]
    3031  [Content(typeof(TSPLIBTSPInstanceProvider), IsDefaultView = true)]
    31   public partial class TSPLIBTSPInstanceProviderView : ProblemInstanceProviderView<TSPData> {
     32  public partial class TSPLIBTSPInstanceProviderView : ProblemInstanceProviderViewGeneric<TSPData> {
    3233    public new TSPLIBTSPInstanceProvider Content {
    3334      get { return (TSPLIBTSPInstanceProvider)base.Content; }
     
    4344        if (dialog.ShowDialog() == DialogResult.OK) {
    4445          var instance = Content.LoadData(dialog.TSPFileName, dialog.TourFileName, dialog.Quality);
    45           Content.Consumer.Load(instance);
     46          try {
     47            GenericConsumer.Load(instance);
     48          }
     49          catch (Exception ex) {
     50            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");
     51          }
    4652        }
    4753      }
Note: See TracChangeset for help on using the changeset viewer.