Free cookie consent management tool by TermsFeed Policy Generator

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

#1784: merge branch ProblemInstancesRegressionAndClassification into trunk

Location:
trunk/sources
Files:
5 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/HeuristicLab.Problems.Instances.TSPLIB.Views-3.3.csproj

    r7650 r7823  
    142142      <Project>{A9AD58B9-3EF9-4CC1-97E5-8D909039FF5C}</Project>
    143143      <Name>HeuristicLab.Common-3.3</Name>
    144       <Private>False</Private>
    145     </ProjectReference>
    146     <ProjectReference Include="..\..\HeuristicLab.Core\3.3\HeuristicLab.Core-3.3.csproj">
    147       <Project>{C36BD924-A541-4A00-AFA8-41701378DDC5}</Project>
    148       <Name>HeuristicLab.Core-3.3</Name>
    149       <Private>False</Private>
    150144    </ProjectReference>
    151145    <ProjectReference Include="..\..\HeuristicLab.Data\3.3\HeuristicLab.Data-3.3.csproj">
     
    157151      <Project>{AB687BBE-1BFE-476B-906D-44237135431D}</Project>
    158152      <Name>HeuristicLab.MainForm.WindowsForms-3.3</Name>
    159       <Private>False</Private>
    160153    </ProjectReference>
    161154    <ProjectReference Include="..\..\HeuristicLab.MainForm\3.3\HeuristicLab.MainForm-3.3.csproj">
    162155      <Project>{3BD61258-31DA-4B09-89C0-4F71FEF5F05A}</Project>
    163156      <Name>HeuristicLab.MainForm-3.3</Name>
    164       <Private>False</Private>
    165     </ProjectReference>
    166     <ProjectReference Include="..\..\HeuristicLab.Optimization.Views\3.3\HeuristicLab.Optimization.Views-3.3.csproj">
    167       <Project>{662B4B15-8F4D-4AE5-B3EB-D91C215F5AF2}</Project>
    168       <Name>HeuristicLab.Optimization.Views-3.3</Name>
    169       <Private>False</Private>
    170     </ProjectReference>
    171     <ProjectReference Include="..\..\HeuristicLab.Optimization\3.3\HeuristicLab.Optimization-3.3.csproj">
    172       <Project>{14AB8D24-25BC-400C-A846-4627AA945192}</Project>
    173       <Name>HeuristicLab.Optimization-3.3</Name>
    174157      <Private>False</Private>
    175158    </ProjectReference>
     
    182165      <Project>{CE0F99D6-1C56-48A9-9B68-3E5B833703EF}</Project>
    183166      <Name>HeuristicLab.Problems.Instances.TSPLIB-3.3</Name>
     167      <Private>False</Private>
     168    </ProjectReference>
     169    <ProjectReference Include="..\..\HeuristicLab.Problems.Instances.Views\3.4\HeuristicLab.Problems.Instances.Views-3.4.csproj">
     170      <Project>{B1BA398F-953F-4C3A-B07B-1E5E17A27DD9}</Project>
     171      <Name>HeuristicLab.Problems.Instances.Views-3.4</Name>
    184172      <Private>False</Private>
    185173    </ProjectReference>
  • trunk/sources/HeuristicLab.Problems.Instances.TSPLIB.Views/3.3/Plugin.cs.frame

    r7558 r7823  
    2828  [PluginDependency("HeuristicLab.Data", "3.3")]
    2929  [PluginDependency("HeuristicLab.MainForm", "3.3")]
    30   [PluginDependency("HeuristicLab.Optimization.Views", "3.3")]
    3130  [PluginDependency("HeuristicLab.Problems.Instances", "3.3")]
    3231  [PluginDependency("HeuristicLab.Problems.Instances.TSPLIB", "3.3")]
     32  [PluginDependency("HeuristicLab.Problems.Instances.Views", "3.4")]
    3333  public class HeuristicLabProblemsInstancesTSPLIBViewsPlugin : PluginBase {
    3434  }
  • 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.