Changeset 1699


Ignore:
Timestamp:
04/28/09 16:05:09 (12 years ago)
Author:
epitzer
Message:

Migrate HL.Routing.TSP to new persistence library. (#603)

Location:
trunk/sources
Files:
5 edited
1 moved

Legend:

Unmodified
Added
Removed
  • trunk/sources/HeuristicLab.Routing.TSP/3.3/HeuristicLab.Routing.TSP-3.3.csproj

    r1697 r1699  
    55    <ProductVersion>9.0.30729</ProductVersion>
    66    <SchemaVersion>2.0</SchemaVersion>
    7     <ProjectGuid>{9EF75B49-D507-44E0-BC5D-C200FDA53B9B}</ProjectGuid>
     7    <ProjectGuid>{600287A3-8714-453E-B875-A05F3EB72315}</ProjectGuid>
    88    <OutputType>Library</OutputType>
    99    <AppDesignerFolder>Properties</AppDesignerFolder>
    1010    <RootNamespace>HeuristicLab.Routing.TSP</RootNamespace>
    11     <AssemblyName>HeuristicLab.Routing.TSP-3.2</AssemblyName>
     11    <AssemblyName>HeuristicLab.Routing.TSP-3.3</AssemblyName>
    1212    <SignAssembly>true</SignAssembly>
    1313    <AssemblyOriginatorKeyFile>HeuristicLab.snk</AssemblyOriginatorKeyFile>
     
    1717    <UpgradeBackupLocation>
    1818    </UpgradeBackupLocation>
     19    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
    1920  </PropertyGroup>
    2021  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     
    3637    <ErrorReport>prompt</ErrorReport>
    3738    <WarningLevel>4</WarningLevel>
    38     <DocumentationFile>bin\Release\HeuristicLab.Routing.TSP-3.2.XML</DocumentationFile>
     39    <DocumentationFile>bin\Release\HeuristicLab.Routing.TSP-3.3.xml</DocumentationFile>
    3940    <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
    4041  </PropertyGroup>
     
    7576  <ItemGroup>
    7677    <Reference Include="System" />
     78    <Reference Include="System.Core">
     79      <RequiredTargetFramework>3.5</RequiredTargetFramework>
     80    </Reference>
    7781    <Reference Include="System.Data" />
    7882    <Reference Include="System.Drawing" />
     
    106110  </ItemGroup>
    107111  <ItemGroup>
    108     <ProjectReference Include="..\..\HeuristicLab.Charting\3.2\HeuristicLab.Charting-3.2.csproj">
    109       <Project>{B462D3CC-8866-42F0-9832-AD0967613B72}</Project>
    110       <Name>HeuristicLab.Charting-3.2</Name>
     112    <ProjectReference Include="..\..\HeuristicLab.Charting\3.3\HeuristicLab.Charting-3.3.csproj">
     113      <Project>{A8265018-D687-4907-8A36-63B25967A038}</Project>
     114      <Name>HeuristicLab.Charting-3.3</Name>
    111115    </ProjectReference>
    112     <ProjectReference Include="..\..\HeuristicLab.Core\3.2\HeuristicLab.Core-3.2.csproj">
    113       <Project>{F43B59AB-2B8C-4570-BC1E-15592086517C}</Project>
    114       <Name>HeuristicLab.Core-3.2</Name>
     116    <ProjectReference Include="..\..\HeuristicLab.Core\3.3\HeuristicLab.Core-3.3.csproj">
     117      <Project>{C36BD924-A541-4A00-AFA8-41701378DDC5}</Project>
     118      <Name>HeuristicLab.Core-3.3</Name>
    115119    </ProjectReference>
    116     <ProjectReference Include="..\..\HeuristicLab.Data\3.2\HeuristicLab.Data-3.2.csproj">
    117       <Project>{F473D9AF-3F09-4296-9F28-3C65118DAFFA}</Project>
    118       <Name>HeuristicLab.Data-3.2</Name>
     120    <ProjectReference Include="..\..\HeuristicLab.Data\3.3\HeuristicLab.Data-3.3.csproj">
     121      <Project>{BBAB9DF5-5EF3-4BA8-ADE9-B36E82114937}</Project>
     122      <Name>HeuristicLab.Data-3.3</Name>
    119123    </ProjectReference>
    120     <ProjectReference Include="..\..\HeuristicLab.Operators\3.2\HeuristicLab.Operators-3.2.csproj">
    121       <Project>{A9983BA2-B3B2-475E-8E2C-62050B71D1C5}</Project>
    122       <Name>HeuristicLab.Operators-3.2</Name>
     124    <ProjectReference Include="..\..\HeuristicLab.Operators\3.3\HeuristicLab.Operators-3.3.csproj">
     125      <Project>{23DA7FF4-D5B8-41B6-AA96-F0561D24F3EE}</Project>
     126      <Name>HeuristicLab.Operators-3.3</Name>
    123127    </ProjectReference>
    124     <ProjectReference Include="..\..\HeuristicLab.Permutation\3.2\HeuristicLab.Permutation-3.2.csproj">
    125       <Project>{55FDCFB3-3E8C-4FB0-837C-0CF06BEDED39}</Project>
    126       <Name>HeuristicLab.Permutation-3.2</Name>
     128    <ProjectReference Include="..\..\HeuristicLab.Permutation\3.3\HeuristicLab.Permutation-3.3.csproj">
     129      <Project>{00282156-589D-424F-9CE4-A8038636C926}</Project>
     130      <Name>HeuristicLab.Permutation-3.3</Name>
     131    </ProjectReference>
     132    <ProjectReference Include="..\..\HeuristicLab.Persistence\3.3\HeuristicLab.Persistence-3.3.csproj">
     133      <Project>{102BC7D3-0EF9-439C-8F6D-96FF0FDB8E1B}</Project>
     134      <Name>HeuristicLab.Persistence-3.3</Name>
    127135    </ProjectReference>
    128136    <ProjectReference Include="..\..\HeuristicLab.PluginInfrastructure\HeuristicLab.PluginInfrastructure.csproj">
  • trunk/sources/HeuristicLab.Routing.TSP/3.3/HeuristicLabRoutingTSPPlugin.cs

    r1530 r1699  
    2929  /// Plugin class for HeuristicLab.Routing.TSP plugin
    3030  /// </summary>
    31   [ClassInfo(Name = "HeuristicLab.Routing.TSP-3.2")]
    32   [PluginFile(Filename = "HeuristicLab.Routing.TSP-3.2.dll", Filetype = PluginFileType.Assembly)]
    33   [Dependency(Dependency = "HeuristicLab.Core-3.2")]
    34   [Dependency(Dependency = "HeuristicLab.Data-3.2")]
    35   [Dependency(Dependency = "HeuristicLab.Operators-3.2")]
    36   [Dependency(Dependency = "HeuristicLab.Permutation-3.2")]
    37   [Dependency(Dependency = "HeuristicLab.Charting-3.2")]
     31  [ClassInfo(Name = "HeuristicLab.Routing.TSP-3.3")]
     32  [PluginFile(Filename = "HeuristicLab.Routing.TSP-3.3.dll", Filetype = PluginFileType.Assembly)]
     33  [Dependency(Dependency = "HeuristicLab.Core-3.3")]
     34  [Dependency(Dependency = "HeuristicLab.Data-3.3")]
     35  [Dependency(Dependency = "HeuristicLab.Operators-3.3")]
     36  [Dependency(Dependency = "HeuristicLab.Permutation-3.3")]
     37  [Dependency(Dependency = "HeuristicLab.Charting-3.3")]
     38  [Dependency(Dependency = "HeuristicLab.Persistence-3.3")]
    3839  public class HeuristicLabRoutingTSPPlugin : PluginBase {
    3940  }
  • trunk/sources/HeuristicLab.Routing.TSP/3.3/Properties/AssemblyInfo.frame

    r581 r1699  
    5454// You can specify all the values or you can default the Revision and Build Numbers
    5555// by using the '*' as shown below:
    56 [assembly: AssemblyVersion("3.2.0.$WCREV$")]
    57 [assembly: AssemblyFileVersion("3.2.0.$WCREV$")]
     56[assembly: AssemblyVersion("3.3.0.$WCREV$")]
     57[assembly: AssemblyFileVersion("3.3.0.$WCREV$")]
    5858[assembly: AssemblyBuildDate("$WCNOW$")]
  • trunk/sources/HeuristicLab.Routing.TSP/3.3/TSPTour.cs

    r1530 r1699  
    2727using HeuristicLab.Data;
    2828using HeuristicLab.Permutation;
     29using HeuristicLab.Persistence.Default.Decomposers.Storable;
    2930
    3031namespace HeuristicLab.Routing.TSP {
     
    3334  /// </summary>
    3435  public class TSPTour : ItemBase, IVisualizationItem {
     36
     37    [Storable]
    3538    private DoubleMatrixData myCoordinates;
    3639    /// <summary>
     
    4144      set { myCoordinates = value; }
    4245    }
     46
     47    [Storable]
    4348    private Permutation.Permutation myTour;
    4449    /// <summary>
     
    109114      if (TourChanged != null)
    110115        TourChanged(this, new EventArgs());
    111     }
    112 
    113     #region Persistence Methods
    114     /// <summary>
    115     /// Saves the current instance as <see cref="XmlNode"/> in the specified <paramref name="document"/>.
    116     /// </summary>
    117     /// <remarks>Calls <see cref="StorableBase.GetXmlNode"/> of base class <see cref="ItemBase"/>. <br/>
    118     /// The coordinates and the tour are saved as a child node with the tag names <c>Coordinates</c> and
    119     /// <c>Tour</c>.</remarks>
    120     /// <param name="name">The (tag)name of the <see cref="XmlNode"/>.</param>
    121     /// <param name="document">The <see cref="XmlDocument"/> where to save the data.</param>
    122     /// <param name="persistedObjects">The dictionary of all already persisted objects.
    123     /// (Needed to avoid cycles.)</param>
    124     /// <returns>The saved <see cref="XmlNode"/>.</returns>
    125     public override XmlNode GetXmlNode(string name, XmlDocument document, IDictionary<Guid, IStorable> persistedObjects) {
    126       XmlNode node = base.GetXmlNode(name, document, persistedObjects);
    127       node.AppendChild(PersistenceManager.Persist("Coordinates", Coordinates, document, persistedObjects));
    128       node.AppendChild(PersistenceManager.Persist("Tour", Tour, document, persistedObjects));
    129       return node;
    130     }
    131     /// <summary>
    132     /// Loads the persisted TSP tour from the specified <paramref name="node"/>.
    133     /// </summary>
    134     /// <remarks>Calls <see cref="StorableBase.Populate"/> of base class
    135     /// <see cref="ItemBase"/>.<br/>
    136     /// The coordinates and the tour must be saved as child nodes with the tag names <c>Coordinates</c>
    137     /// and <c>Tour</c> (see <see cref="GetXmlNode"/>).</remarks>
    138     /// <param name="node">The <see cref="XmlNode"/> where the TSP tour is saved.</param>
    139     /// <param name="restoredObjects">A dictionary of all already restored objects. (Needed to avoid cycles.)</param>
    140     public override void Populate(XmlNode node, IDictionary<Guid, IStorable> restoredObjects) {
    141       base.Populate(node, restoredObjects);
    142       myCoordinates = (DoubleMatrixData)PersistenceManager.Restore(node.SelectSingleNode("Coordinates"), restoredObjects);
    143       myTour = (Permutation.Permutation)PersistenceManager.Restore(node.SelectSingleNode("Tour"), restoredObjects);
    144     }
    145     #endregion
     116    }   
    146117  }
    147118}
  • trunk/sources/HeuristicLab.sln

    r1694 r1699  
    186186EndProject
    187187Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Selection-3.3", "HeuristicLab.Selection\3.3\HeuristicLab.Selection-3.3.csproj", "{2C36CD4F-E5F5-43A4-801A-201EA895FE17}"
     188EndProject
     189Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Charting-3.3", "HeuristicLab.Charting\3.3\HeuristicLab.Charting-3.3.csproj", "{A8265018-D687-4907-8A36-63B25967A038}"
     190EndProject
     191Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Routing.TSP-3.3", "HeuristicLab.Routing.TSP\3.3\HeuristicLab.Routing.TSP-3.3.csproj", "{600287A3-8714-453E-B875-A05F3EB72315}"
    188192EndProject
    189193Global
     
    27962800    {2C36CD4F-E5F5-43A4-801A-201EA895FE17}.Visualization Debug|x86.ActiveCfg = Debug|x86
    27972801    {2C36CD4F-E5F5-43A4-801A-201EA895FE17}.Visualization Debug|x86.Build.0 = Debug|x86
     2802    {A8265018-D687-4907-8A36-63B25967A038}.CEDMA Debug|Any CPU.ActiveCfg = Debug|Any CPU
     2803    {A8265018-D687-4907-8A36-63B25967A038}.CEDMA Debug|Any CPU.Build.0 = Debug|Any CPU
     2804    {A8265018-D687-4907-8A36-63B25967A038}.CEDMA Debug|x64.ActiveCfg = Debug|x64
     2805    {A8265018-D687-4907-8A36-63B25967A038}.CEDMA Debug|x64.Build.0 = Debug|x64
     2806    {A8265018-D687-4907-8A36-63B25967A038}.CEDMA Debug|x86.ActiveCfg = Debug|x86
     2807    {A8265018-D687-4907-8A36-63B25967A038}.CEDMA Debug|x86.Build.0 = Debug|x86
     2808    {A8265018-D687-4907-8A36-63B25967A038}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
     2809    {A8265018-D687-4907-8A36-63B25967A038}.Debug|Any CPU.Build.0 = Debug|Any CPU
     2810    {A8265018-D687-4907-8A36-63B25967A038}.Debug|x64.ActiveCfg = Debug|x64
     2811    {A8265018-D687-4907-8A36-63B25967A038}.Debug|x64.Build.0 = Debug|x64
     2812    {A8265018-D687-4907-8A36-63B25967A038}.Debug|x86.ActiveCfg = Debug|x86
     2813    {A8265018-D687-4907-8A36-63B25967A038}.Debug|x86.Build.0 = Debug|x86
     2814    {A8265018-D687-4907-8A36-63B25967A038}.GP Debug|Any CPU.ActiveCfg = Debug|Any CPU
     2815    {A8265018-D687-4907-8A36-63B25967A038}.GP Debug|Any CPU.Build.0 = Debug|Any CPU
     2816    {A8265018-D687-4907-8A36-63B25967A038}.GP Debug|x64.ActiveCfg = Debug|x64
     2817    {A8265018-D687-4907-8A36-63B25967A038}.GP Debug|x64.Build.0 = Debug|x64
     2818    {A8265018-D687-4907-8A36-63B25967A038}.GP Debug|x86.ActiveCfg = Debug|x86
     2819    {A8265018-D687-4907-8A36-63B25967A038}.GP Debug|x86.Build.0 = Debug|x86
     2820    {A8265018-D687-4907-8A36-63B25967A038}.Release|Any CPU.ActiveCfg = Release|Any CPU
     2821    {A8265018-D687-4907-8A36-63B25967A038}.Release|Any CPU.Build.0 = Release|Any CPU
     2822    {A8265018-D687-4907-8A36-63B25967A038}.Release|x64.ActiveCfg = Release|x64
     2823    {A8265018-D687-4907-8A36-63B25967A038}.Release|x64.Build.0 = Release|x64
     2824    {A8265018-D687-4907-8A36-63B25967A038}.Release|x86.ActiveCfg = Release|x86
     2825    {A8265018-D687-4907-8A36-63B25967A038}.Release|x86.Build.0 = Release|x86
     2826    {A8265018-D687-4907-8A36-63B25967A038}.Visualization Debug|Any CPU.ActiveCfg = Debug|Any CPU
     2827    {A8265018-D687-4907-8A36-63B25967A038}.Visualization Debug|Any CPU.Build.0 = Debug|Any CPU
     2828    {A8265018-D687-4907-8A36-63B25967A038}.Visualization Debug|x64.ActiveCfg = Debug|x64
     2829    {A8265018-D687-4907-8A36-63B25967A038}.Visualization Debug|x64.Build.0 = Debug|x64
     2830    {A8265018-D687-4907-8A36-63B25967A038}.Visualization Debug|x86.ActiveCfg = Debug|x86
     2831    {A8265018-D687-4907-8A36-63B25967A038}.Visualization Debug|x86.Build.0 = Debug|x86
     2832    {600287A3-8714-453E-B875-A05F3EB72315}.CEDMA Debug|Any CPU.ActiveCfg = Debug|Any CPU
     2833    {600287A3-8714-453E-B875-A05F3EB72315}.CEDMA Debug|Any CPU.Build.0 = Debug|Any CPU
     2834    {600287A3-8714-453E-B875-A05F3EB72315}.CEDMA Debug|x64.ActiveCfg = Debug|x64
     2835    {600287A3-8714-453E-B875-A05F3EB72315}.CEDMA Debug|x64.Build.0 = Debug|x64
     2836    {600287A3-8714-453E-B875-A05F3EB72315}.CEDMA Debug|x86.ActiveCfg = Debug|x86
     2837    {600287A3-8714-453E-B875-A05F3EB72315}.CEDMA Debug|x86.Build.0 = Debug|x86
     2838    {600287A3-8714-453E-B875-A05F3EB72315}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
     2839    {600287A3-8714-453E-B875-A05F3EB72315}.Debug|Any CPU.Build.0 = Debug|Any CPU
     2840    {600287A3-8714-453E-B875-A05F3EB72315}.Debug|x64.ActiveCfg = Debug|x64
     2841    {600287A3-8714-453E-B875-A05F3EB72315}.Debug|x64.Build.0 = Debug|x64
     2842    {600287A3-8714-453E-B875-A05F3EB72315}.Debug|x86.ActiveCfg = Debug|x86
     2843    {600287A3-8714-453E-B875-A05F3EB72315}.Debug|x86.Build.0 = Debug|x86
     2844    {600287A3-8714-453E-B875-A05F3EB72315}.GP Debug|Any CPU.ActiveCfg = Debug|Any CPU
     2845    {600287A3-8714-453E-B875-A05F3EB72315}.GP Debug|Any CPU.Build.0 = Debug|Any CPU
     2846    {600287A3-8714-453E-B875-A05F3EB72315}.GP Debug|x64.ActiveCfg = Debug|x64
     2847    {600287A3-8714-453E-B875-A05F3EB72315}.GP Debug|x64.Build.0 = Debug|x64
     2848    {600287A3-8714-453E-B875-A05F3EB72315}.GP Debug|x86.ActiveCfg = Debug|x86
     2849    {600287A3-8714-453E-B875-A05F3EB72315}.GP Debug|x86.Build.0 = Debug|x86
     2850    {600287A3-8714-453E-B875-A05F3EB72315}.Release|Any CPU.ActiveCfg = Release|Any CPU
     2851    {600287A3-8714-453E-B875-A05F3EB72315}.Release|Any CPU.Build.0 = Release|Any CPU
     2852    {600287A3-8714-453E-B875-A05F3EB72315}.Release|x64.ActiveCfg = Release|x64
     2853    {600287A3-8714-453E-B875-A05F3EB72315}.Release|x64.Build.0 = Release|x64
     2854    {600287A3-8714-453E-B875-A05F3EB72315}.Release|x86.ActiveCfg = Release|x86
     2855    {600287A3-8714-453E-B875-A05F3EB72315}.Release|x86.Build.0 = Release|x86
     2856    {600287A3-8714-453E-B875-A05F3EB72315}.Visualization Debug|Any CPU.ActiveCfg = Debug|Any CPU
     2857    {600287A3-8714-453E-B875-A05F3EB72315}.Visualization Debug|Any CPU.Build.0 = Debug|Any CPU
     2858    {600287A3-8714-453E-B875-A05F3EB72315}.Visualization Debug|x64.ActiveCfg = Debug|x64
     2859    {600287A3-8714-453E-B875-A05F3EB72315}.Visualization Debug|x64.Build.0 = Debug|x64
     2860    {600287A3-8714-453E-B875-A05F3EB72315}.Visualization Debug|x86.ActiveCfg = Debug|x86
     2861    {600287A3-8714-453E-B875-A05F3EB72315}.Visualization Debug|x86.Build.0 = Debug|x86
    27982862  EndGlobalSection
    27992863  GlobalSection(SolutionProperties) = preSolution
  • trunk/sources/HeuristicLab/CopyAssemblies.cmd

    r1696 r1699  
    7777copy "%SolutionDir%\HeuristicLab.RealVector\3.2\%Outdir%\HeuristicLab.RealVector-3.2.dll" .\plugins
    7878copy "%SolutionDir%\HeuristicLab.Routing.TSP\3.2\%Outdir%\HeuristicLab.Routing.TSP-3.2.dll" .\plugins
     79copy "%SolutionDir%\HeuristicLab.Routing.TSP\3.3\%Outdir%\HeuristicLab.Routing.TSP-3.3.dll" .\plugins
    7980copy "%SolutionDir%\HeuristicLab.SA\3.2\%Outdir%\HeuristicLab.SA-3.2.dll" .\plugins
    8081copy "%SolutionDir%\HeuristicLab.Scheduling.JSSP\3.2\%Outdir%\HeuristicLab.Scheduling.JSSP-3.2.dll" .\plugins
Note: See TracChangeset for help on using the changeset viewer.