Free cookie consent management tool by TermsFeed Policy Generator

Changeset 2906 for trunk


Ignore:
Timestamp:
03/01/10 22:08:05 (14 years ago)
Author:
swagner
Message:

Operator architecture refactoring (#95)

  • renamed HeuristicLab.Permutation to HeuristicLab.Encodings.Permutation
Location:
trunk/sources
Files:
1 added
3 deleted
55 edited
3 copied
1 moved

Legend:

Unmodified
Added
Removed

  • trunk/sources/HeuristicLab 3.3.sln

    r2905 r2906  
    2626EndProject
    2727Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.SequentialEngine-3.3", "HeuristicLab.SequentialEngine\3.3\HeuristicLab.SequentialEngine-3.3.csproj", "{DC3D7072-7999-4719-B65D-3997744D5DC1}"
    28 EndProject
    29 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Permutation-3.3", "HeuristicLab.Permutation\3.3\HeuristicLab.Permutation-3.3.csproj", "{00282156-589D-424F-9CE4-A8038636C926}"
    3028EndProject
    3129Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Evolutionary-3.3", "HeuristicLab.Evolutionary\3.3\HeuristicLab.Evolutionary-3.3.csproj", "{25087811-F74C-4128-BC86-8324271DA13E}"
    … …  
    157155Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Optimization.Views-3.3", "HeuristicLab.Optimization.Views\3.3\HeuristicLab.Optimization.Views-3.3.csproj", "{662B4B15-8F4D-4AE5-B3EB-D91C215F5AF2}"
    158156EndProject
    159 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Permutation-3.3.Tests", "HeuristicLab.Permutation\3.3\Tests\HeuristicLab.Permutation-3.3.Tests.csproj", "{4D59BEC9-A69E-4686-B8C9-0E6C073B093E}"
    160 EndProject
    161157Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Problems.TSP-3.3", "HeuristicLab.Problems.TSP\3.3\HeuristicLab.Problems.TSP-3.3.csproj", "{600287A3-8714-453E-B875-A05F3EB72315}"
    162158EndProject
    … …  
    174170EndProject
    175171Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Encodings.RealVector-3.3", "HeuristicLab.Encodings.RealVector\3.3\HeuristicLab.Encodings.RealVector-3.3.csproj", "{2D4E4565-3ED9-4BEB-AE75-39D871843D24}"
     172EndProject
     173Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Encodings.Permutation-3.3", "HeuristicLab.Encodings.Permutation\3.3\HeuristicLab.Encodings.Permutation-3.3.csproj", "{00282156-589D-424F-9CE4-A8038636C926}"
     174EndProject
     175Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Encodings.Permutation-3.3.Tests", "HeuristicLab.Encodings.Permutation\3.3\Tests\HeuristicLab.Encodings.Permutation-3.3.Tests.csproj", "{4D59BEC9-A69E-4686-B8C9-0E6C073B093E}"
    176176EndProject
    177177Global
    … …  
    281281    {DC3D7072-7999-4719-B65D-3997744D5DC1}.Release|x86.ActiveCfg = Release|x86
    282282    {DC3D7072-7999-4719-B65D-3997744D5DC1}.Release|x86.Build.0 = Release|x86
    283     {00282156-589D-424F-9CE4-A8038636C926}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
    284     {00282156-589D-424F-9CE4-A8038636C926}.Debug|Any CPU.Build.0 = Debug|Any CPU
    285     {00282156-589D-424F-9CE4-A8038636C926}.Debug|x64.ActiveCfg = Debug|x64
    286     {00282156-589D-424F-9CE4-A8038636C926}.Debug|x64.Build.0 = Debug|x64
    287     {00282156-589D-424F-9CE4-A8038636C926}.Debug|x86.ActiveCfg = Debug|x86
    288     {00282156-589D-424F-9CE4-A8038636C926}.Debug|x86.Build.0 = Debug|x86
    289     {00282156-589D-424F-9CE4-A8038636C926}.Release|Any CPU.ActiveCfg = Release|Any CPU
    290     {00282156-589D-424F-9CE4-A8038636C926}.Release|Any CPU.Build.0 = Release|Any CPU
    291     {00282156-589D-424F-9CE4-A8038636C926}.Release|x64.ActiveCfg = Release|x64
    292     {00282156-589D-424F-9CE4-A8038636C926}.Release|x64.Build.0 = Release|x64
    293     {00282156-589D-424F-9CE4-A8038636C926}.Release|x86.ActiveCfg = Release|x86
    294     {00282156-589D-424F-9CE4-A8038636C926}.Release|x86.Build.0 = Release|x86
    295283    {25087811-F74C-4128-BC86-8324271DA13E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
    296284    {25087811-F74C-4128-BC86-8324271DA13E}.Debug|Any CPU.Build.0 = Debug|Any CPU
    … …  
    688676    {662B4B15-8F4D-4AE5-B3EB-D91C215F5AF2}.Release|x86.ActiveCfg = Release|x86
    689677    {662B4B15-8F4D-4AE5-B3EB-D91C215F5AF2}.Release|x86.Build.0 = Release|x86
    690     {4D59BEC9-A69E-4686-B8C9-0E6C073B093E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
    691     {4D59BEC9-A69E-4686-B8C9-0E6C073B093E}.Debug|Any CPU.Build.0 = Debug|Any CPU
    692     {4D59BEC9-A69E-4686-B8C9-0E6C073B093E}.Debug|x64.ActiveCfg = Debug|x64
    693     {4D59BEC9-A69E-4686-B8C9-0E6C073B093E}.Debug|x64.Build.0 = Debug|x64
    694     {4D59BEC9-A69E-4686-B8C9-0E6C073B093E}.Debug|x86.ActiveCfg = Debug|x86
    695     {4D59BEC9-A69E-4686-B8C9-0E6C073B093E}.Debug|x86.Build.0 = Debug|x86
    696     {4D59BEC9-A69E-4686-B8C9-0E6C073B093E}.Release|Any CPU.ActiveCfg = Release|Any CPU
    697     {4D59BEC9-A69E-4686-B8C9-0E6C073B093E}.Release|Any CPU.Build.0 = Release|Any CPU
    698     {4D59BEC9-A69E-4686-B8C9-0E6C073B093E}.Release|x64.ActiveCfg = Release|Any CPU
    699     {4D59BEC9-A69E-4686-B8C9-0E6C073B093E}.Release|x86.ActiveCfg = Release|x86
    700     {4D59BEC9-A69E-4686-B8C9-0E6C073B093E}.Release|x86.Build.0 = Release|x86
    701678    {600287A3-8714-453E-B875-A05F3EB72315}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
    702679    {600287A3-8714-453E-B875-A05F3EB72315}.Debug|Any CPU.Build.0 = Debug|Any CPU
    … …  
    785762    {2D4E4565-3ED9-4BEB-AE75-39D871843D24}.Release|x86.ActiveCfg = Release|x86
    786763    {2D4E4565-3ED9-4BEB-AE75-39D871843D24}.Release|x86.Build.0 = Release|x86
     764    {00282156-589D-424F-9CE4-A8038636C926}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
     765    {00282156-589D-424F-9CE4-A8038636C926}.Debug|Any CPU.Build.0 = Debug|Any CPU
     766    {00282156-589D-424F-9CE4-A8038636C926}.Debug|x64.ActiveCfg = Debug|x64
     767    {00282156-589D-424F-9CE4-A8038636C926}.Debug|x64.Build.0 = Debug|x64
     768    {00282156-589D-424F-9CE4-A8038636C926}.Debug|x86.ActiveCfg = Debug|x86
     769    {00282156-589D-424F-9CE4-A8038636C926}.Debug|x86.Build.0 = Debug|x86
     770    {00282156-589D-424F-9CE4-A8038636C926}.Release|Any CPU.ActiveCfg = Release|Any CPU
     771    {00282156-589D-424F-9CE4-A8038636C926}.Release|Any CPU.Build.0 = Release|Any CPU
     772    {00282156-589D-424F-9CE4-A8038636C926}.Release|x64.ActiveCfg = Release|x64
     773    {00282156-589D-424F-9CE4-A8038636C926}.Release|x64.Build.0 = Release|x64
     774    {00282156-589D-424F-9CE4-A8038636C926}.Release|x86.ActiveCfg = Release|x86
     775    {00282156-589D-424F-9CE4-A8038636C926}.Release|x86.Build.0 = Release|x86
     776    {4D59BEC9-A69E-4686-B8C9-0E6C073B093E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
     777    {4D59BEC9-A69E-4686-B8C9-0E6C073B093E}.Debug|Any CPU.Build.0 = Debug|Any CPU
     778    {4D59BEC9-A69E-4686-B8C9-0E6C073B093E}.Debug|x64.ActiveCfg = Debug|x64
     779    {4D59BEC9-A69E-4686-B8C9-0E6C073B093E}.Debug|x64.Build.0 = Debug|x64
     780    {4D59BEC9-A69E-4686-B8C9-0E6C073B093E}.Debug|x86.ActiveCfg = Debug|x86
     781    {4D59BEC9-A69E-4686-B8C9-0E6C073B093E}.Debug|x86.Build.0 = Debug|x86
     782    {4D59BEC9-A69E-4686-B8C9-0E6C073B093E}.Release|Any CPU.ActiveCfg = Release|Any CPU
     783    {4D59BEC9-A69E-4686-B8C9-0E6C073B093E}.Release|Any CPU.Build.0 = Release|Any CPU
     784    {4D59BEC9-A69E-4686-B8C9-0E6C073B093E}.Release|x64.ActiveCfg = Release|x64
     785    {4D59BEC9-A69E-4686-B8C9-0E6C073B093E}.Release|x64.Build.0 = Release|x64
     786    {4D59BEC9-A69E-4686-B8C9-0E6C073B093E}.Release|x86.ActiveCfg = Release|x86
     787    {4D59BEC9-A69E-4686-B8C9-0E6C073B093E}.Release|x86.Build.0 = Release|x86
    787788  EndGlobalSection
    788789  GlobalSection(SolutionProperties) = preSolution

  • trunk/sources/HeuristicLab 3.3/Files.txt

    r2905 r2906  
    1818HeuristicLab.Data\3.3:HeuristicLab.Data-3.3.dll
    1919HeuristicLab.Data.Views\3.3:HeuristicLab.Data.Views-3.3.dll
     20HeuristicLab.Encodings.Permutation\3.3:HeuristicLab.Encodings.Permutation-3.3.dll
    2021HeuristicLab.Encodings.RealVector\3.3:HeuristicLab.Encodings.RealVector-3.3.dll
    2122HeuristicLab.Evolutionary\3.3:HeuristicLab.Evolutionary-3.3.dll
    … …  
    3334HeuristicLab.Parameters\3.3:HeuristicLab.Parameters-3.3.dll
    3435HeuristicLab.Parameters.Views\3.3:HeuristicLab.Parameters.Views-3.3.dll
    35 HeuristicLab.Permutation\3.3:HeuristicLab.Permutation-3.3.dll
    3636HeuristicLab.Persistence\3.3:HeuristicLab.Persistence-3.3.dll
    3737HeuristicLab.Persistence.GUI\3.3:HeuristicLab.Persistence.GUI-3.3.dll

  • trunk/sources/HeuristicLab.Algorithms.SGA/3.3/Tests/HeuristicLab.Algorithms.SGA-3.3.Tests.csproj

    r2900 r2906  
    102102      <Name>HeuristicLab.Data-3.3</Name>
    103103    </ProjectReference>
     104    <ProjectReference Include="..\..\..\HeuristicLab.Encodings.Permutation\3.3\HeuristicLab.Encodings.Permutation-3.3.csproj">
     105      <Project>{00282156-589D-424F-9CE4-A8038636C926}</Project>
     106      <Name>HeuristicLab.Encodings.Permutation-3.3</Name>
     107    </ProjectReference>
    104108    <ProjectReference Include="..\..\..\HeuristicLab.Evolutionary\3.3\HeuristicLab.Evolutionary-3.3.csproj">
    105109      <Project>{25087811-F74C-4128-BC86-8324271DA13E}</Project>
    … …  
    113117      <Project>{56F9106A-079F-4C61-92F6-86A84C2D84B7}</Project>
    114118      <Name>HeuristicLab.Parameters-3.3</Name>
    115     </ProjectReference>
    116     <ProjectReference Include="..\..\..\HeuristicLab.Permutation\3.3\HeuristicLab.Permutation-3.3.csproj">
    117       <Project>{00282156-589D-424F-9CE4-A8038636C926}</Project>
    118       <Name>HeuristicLab.Permutation-3.3</Name>
    119119    </ProjectReference>
    120120    <ProjectReference Include="..\..\..\HeuristicLab.Persistence\3.3\HeuristicLab.Persistence-3.3.csproj">

  • trunk/sources/HeuristicLab.Encodings.Permutation/3.3

    • Property svn:ignore

      •  

        old new  
        11*.user
        2 HeuristicLabPermutationPlugin.cs
        32bin
        43obj
         4HeuristicLabEncodingsPermutationPlugin.cs

  • trunk/sources/HeuristicLab.Encodings.Permutation/3.3/CosaCrossover.cs

    r2879 r2906  
    2424using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    2525
    26 namespace HeuristicLab.Permutation {
     26namespace HeuristicLab.Encodings.Permutation {
    2727  /// <summary>
    2828  /// Performs the crossover described in the COSA optimization method.

  • trunk/sources/HeuristicLab.Encodings.Permutation/3.3/CyclicCrossover.cs

    r2871 r2906  
    2424using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    2525
    26 namespace HeuristicLab.Permutation {
     26namespace HeuristicLab.Encodings.Permutation {
    2727  /// <summary>
    2828  /// An operator which performs the cyclic crossover on two permutations.

  • trunk/sources/HeuristicLab.Encodings.Permutation/3.3/CyclicCrossover2.cs

    r2871 r2906  
    2424using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    2525
    26 namespace HeuristicLab.Permutation {
     26namespace HeuristicLab.Encodings.Permutation {
    2727  /// <summary>
    2828  /// An operator which performs a variant of the cyclic crossover on two permutations.

  • trunk/sources/HeuristicLab.Encodings.Permutation/3.3/EdgeRecombinationCrossover.cs

    r2871 r2906  
    2424using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    2525
    26 namespace HeuristicLab.Permutation {
     26namespace HeuristicLab.Encodings.Permutation {
    2727  /// <summary>
    2828  /// Performs a cross over permutation between two permutation arrays by calculating the edges (neighbours)

  • trunk/sources/HeuristicLab.Encodings.Permutation/3.3/HeuristicLab.Encodings.Permutation-3.3.csproj

    r2903 r2906  
    88    <OutputType>Library</OutputType>
    99    <AppDesignerFolder>Properties</AppDesignerFolder>
    10     <RootNamespace>HeuristicLab.Permutation</RootNamespace>
    11     <AssemblyName>HeuristicLab.Permutation-3.3</AssemblyName>
     10    <RootNamespace>HeuristicLab.Encodings.Permutation</RootNamespace>
     11    <AssemblyName>HeuristicLab.Encodings.Permutation-3.3</AssemblyName>
    1212    <SignAssembly>true</SignAssembly>
    1313    <AssemblyOriginatorKeyFile>HeuristicLab.snk</AssemblyOriginatorKeyFile>
    … …  
    3636    <WarningLevel>4</WarningLevel>
    3737    <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
    38     <DocumentationFile>bin\Release\HeuristicLab.Permutation-3.3.xml</DocumentationFile>
     38    <DocumentationFile>bin\Release\HeuristicLab.Encodings.Permutation-3.3.xml</DocumentationFile>
    3939  </PropertyGroup>
    4040  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
    … …  
    4949    <OutputPath>bin\x86\Release\</OutputPath>
    5050    <DefineConstants>TRACE</DefineConstants>
    51     <DocumentationFile>bin\x86\Release\HeuristicLab.Permutation-3.3.xml</DocumentationFile>
     51    <DocumentationFile>bin\x86\Release\HeuristicLab.Encodings.Permutation-3.3.xml</DocumentationFile>
    5252    <Optimize>true</Optimize>
    5353    <DebugType>pdbonly</DebugType>
    … …  
    8181  </ItemGroup>
    8282  <ItemGroup>
    83     <None Include="HeuristicLabPermutationPlugin.cs.frame" />
    8483    <Compile Include="CyclicCrossover2.cs" />
     84    <Compile Include="HeuristicLabEncodingsPermutationPlugin.cs" />
    8585    <Compile Include="IPermutationCreator.cs" />
    8686    <Compile Include="IPermutationOperator.cs" />
    … …  
    9999    <Compile Include="PartiallyMatchedCrossover.cs" />
    100100    <Compile Include="PermutationManipulator.cs" />
    101     <Compile Include="HeuristicLabPermutationPlugin.cs" />
    102101    <Compile Include="OrderCrossover.cs" />
    103102    <Compile Include="PermutationCrossover.cs" />
    … …  
    114113  <ItemGroup>
    115114    <None Include="HeuristicLab.snk" />
     115    <None Include="HeuristicLabEncodingsPermutationPlugin.cs.frame" />
    116116    <None Include="Properties\AssemblyInfo.frame" />
    117117  </ItemGroup>
    … …  
    169169
    170170call PreBuildEvent.cmd
    171 SubWCRev "%25ProjectDir%25\" "%25ProjectDir%25\HeuristicLabPermutationPlugin.cs.frame" "%25ProjectDir%25\HeuristicLabPermutationPlugin.cs"</PreBuildEvent>
     171SubWCRev "%25ProjectDir%25\" "%25ProjectDir%25\HeuristicLabEncodingsPermutationPlugin.cs.frame" "%25ProjectDir%25\HeuristicLabEncodingsPermutationPlugin.cs"</PreBuildEvent>
    172172  </PropertyGroup>
    173173</Project>

  • trunk/sources/HeuristicLab.Encodings.Permutation/3.3/HeuristicLabEncodingsPermutationPlugin.cs.frame

    r2903 r2906  
    2222using HeuristicLab.PluginInfrastructure;
    2323
    24 namespace HeuristicLab.Permutation {
     24namespace HeuristicLab.Encodings.Permutation {
    2525  /// <summary>
    26   /// Plugin class for HeuristicLab.Permutation plugin.
     26  /// Plugin class for HeuristicLab.Encodings.Permutation plugin.
    2727  /// </summary>
    28   [Plugin("HeuristicLab.Permutation", "3.3.0.$WCREV$")]
    29   [PluginFile("HeuristicLab.Permutation-3.3.dll", PluginFileType.Assembly)]
     28  [Plugin("HeuristicLab.Encodings.Permutation", "3.3.0.$WCREV$")]
     29  [PluginFile("HeuristicLab.Encodings.Permutation-3.3.dll", PluginFileType.Assembly)]
    3030  [PluginDependency("HeuristicLab.Collections", "3.3")]
    3131  [PluginDependency("HeuristicLab.Common", "3.2")]
    … …  
    3636  [PluginDependency("HeuristicLab.Parameters", "3.3")]
    3737  [PluginDependency("HeuristicLab.Persistence", "3.3")]
    38   public class HeuristicLabPermutationPlugin : PluginBase {
     38  public class HeuristicLabEncodingsPermutationPlugin : PluginBase {
    3939  }
    4040}

  • trunk/sources/HeuristicLab.Encodings.Permutation/3.3/IPermutationCreator.cs

    r2865 r2906  
    2424using HeuristicLab.Optimization;
    2525
    26 namespace HeuristicLab.Permutation {
     26namespace HeuristicLab.Encodings.Permutation {
    2727  /// <summary>
    2828  /// An interface which represents an operator for creating permutations.

  • trunk/sources/HeuristicLab.Encodings.Permutation/3.3/IPermutationCrossover.cs

    r2865 r2906  
    2323using HeuristicLab.Optimization;
    2424
    25 namespace HeuristicLab.Permutation {
     25namespace HeuristicLab.Encodings.Permutation {
    2626  /// <summary>
    2727  /// An interface which represents an operator for crossing permutations.

  • trunk/sources/HeuristicLab.Encodings.Permutation/3.3/IPermutationManipulator.cs

    r2865 r2906  
    2323using HeuristicLab.Optimization;
    2424
    25 namespace HeuristicLab.Permutation {
     25namespace HeuristicLab.Encodings.Permutation {
    2626  /// <summary>
    2727  /// An interface which represents an operator for manipulating solutions.

  • trunk/sources/HeuristicLab.Encodings.Permutation/3.3/IPermutationOperator.cs

    r2865 r2906  
    2222using HeuristicLab.Core;
    2323
    24 namespace HeuristicLab.Permutation {
     24namespace HeuristicLab.Encodings.Permutation {
    2525  /// <summary>
    2626  /// An interface which represents an operator dealing with permutations.

  • trunk/sources/HeuristicLab.Encodings.Permutation/3.3/InsertionManipulator.cs

    r2871 r2906  
    2020#endregion
    2121
    22 using System;
    2322using HeuristicLab.Core;
    2423using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    2524
    26 namespace HeuristicLab.Permutation {
     25namespace HeuristicLab.Encodings.Permutation {
    2726  /// <summary>
    2827  /// Manipulates a permutation array by moving randomly one element to another position in the array.

  • trunk/sources/HeuristicLab.Encodings.Permutation/3.3/InversionManipulator.cs

    r2871 r2906  
    2020#endregion
    2121
    22 using System;
    2322using HeuristicLab.Core;
    2423using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    2524
    26 namespace HeuristicLab.Permutation {
     25namespace HeuristicLab.Encodings.Permutation {
    2726  /// <summary>
    2827  /// An operator which inverts a randomly chosen part of a permutation.

  • trunk/sources/HeuristicLab.Encodings.Permutation/3.3/MaximalPreservativeCrossover.cs

    r2871 r2906  
    2424using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    2525
    26 namespace HeuristicLab.Permutation {
     26namespace HeuristicLab.Encodings.Permutation {
    2727  /// <summary>An operator which performs the maximal preservative crossover on two permutations.</summary>
    2828  /// <remarks>

  • trunk/sources/HeuristicLab.Encodings.Permutation/3.3/OrderBasedCrossover.cs

    r2871 r2906  
    2424using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    2525
    26 namespace HeuristicLab.Permutation {
     26namespace HeuristicLab.Encodings.Permutation {
    2727  /// <summary>
    2828  /// Performs a cross over permutation of two permutation arrays by taking randomly a selection of values

  • trunk/sources/HeuristicLab.Encodings.Permutation/3.3/OrderCrossover.cs

    r2871 r2906  
    2424using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    2525
    26 namespace HeuristicLab.Permutation {
     26namespace HeuristicLab.Encodings.Permutation {
    2727  /// <summary>
    2828  /// An operator which performs the order crossover on two permutations.

  • trunk/sources/HeuristicLab.Encodings.Permutation/3.3/OrderCrossover2.cs

    r2871 r2906  
    2424using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    2525
    26 namespace HeuristicLab.Permutation {
     26namespace HeuristicLab.Encodings.Permutation {
    2727  /// <summary>
    2828  /// An operator which performs a slight variant of the order crossover on two permutations.

  • trunk/sources/HeuristicLab.Encodings.Permutation/3.3/PartiallyMatchedCrossover.cs

    r2871 r2906  
    2424using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    2525
    26 namespace HeuristicLab.Permutation {
     26namespace HeuristicLab.Encodings.Permutation {
    2727  /// <summary>
    2828  /// An operator which performs the partially matched crossover on two permutations.

  • trunk/sources/HeuristicLab.Encodings.Permutation/3.3/Permutation.cs

    r2863 r2906  
    2727using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    2828
    29 namespace HeuristicLab.Permutation {
     29namespace HeuristicLab.Encodings.Permutation {
    3030  [EmptyStorableClass]
    3131  [Item("Permutation", "Represents a permutation of integer values.")]

  • trunk/sources/HeuristicLab.Encodings.Permutation/3.3/PermutationCrossover.cs

    r2865 r2906  
    2626using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    2727
    28 namespace HeuristicLab.Permutation {
     28namespace HeuristicLab.Encodings.Permutation {
    2929  /// <summary>
    3030  /// A base class for permutation crossover operators.

  • trunk/sources/HeuristicLab.Encodings.Permutation/3.3/PermutationManipulator.cs

    r2865 r2906  
    2626using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    2727
    28 namespace HeuristicLab.Permutation {
     28namespace HeuristicLab.Encodings.Permutation {
    2929  /// <summary>
    3030  /// A base class for permutation manipulation operators.

  • trunk/sources/HeuristicLab.Encodings.Permutation/3.3/PositionBasedCrossover.cs

    r2871 r2906  
    2424using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    2525
    26 namespace HeuristicLab.Permutation {
     26namespace HeuristicLab.Encodings.Permutation {
    2727  /// <summary>
    2828  /// Performs a cross over permutation between two permutation arrays based on randomly chosen positions.

  • trunk/sources/HeuristicLab.Encodings.Permutation/3.3/Properties/AssemblyInfo.frame

    r2790 r2906  
    2727// set of attributes. Change these attribute values to modify the information
    2828// associated with an assembly.
    29 [assembly: AssemblyTitle("HeuristicLab.Permutation")]
     29[assembly: AssemblyTitle("HeuristicLab.Encodings.Permutation")]
    3030[assembly: AssemblyDescription("HeuristicLab permutation encoding and related operators")]
    3131[assembly: AssemblyConfiguration("")]

  • trunk/sources/HeuristicLab.Encodings.Permutation/3.3/RandomPermutationCreator.cs

    r2865 r2906  
    2727using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    2828
    29 namespace HeuristicLab.Permutation {
     29namespace HeuristicLab.Encodings.Permutation {
    3030  /// <summary>
    3131  /// An operator which creates a new random permutation of integer values.

  • trunk/sources/HeuristicLab.Encodings.Permutation/3.3/ScrambleManipulator.cs

    r2871 r2906  
    2020#endregion
    2121
    22 using System;
    2322using HeuristicLab.Core;
    2423using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    2524
    26 namespace HeuristicLab.Permutation {
     25namespace HeuristicLab.Encodings.Permutation {
    2726  /// <summary>
    2827  /// Manipulates a permutation array by randomly scrambling the elements in a randomly chosen interval.

  • trunk/sources/HeuristicLab.Encodings.Permutation/3.3/Swap2Manipulator.cs

    r2871 r2906  
    2020#endregion
    2121
    22 using System;
    2322using HeuristicLab.Core;
    2423using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    2524
    26 namespace HeuristicLab.Permutation {
     25namespace HeuristicLab.Encodings.Permutation {
    2726  /// <summary>
    2827  /// Manipulates a permutation array by swapping to randomly chosen elements.

  • trunk/sources/HeuristicLab.Encodings.Permutation/3.3/Swap3Manipulator.cs

    r2871 r2906  
    2424using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    2525
    26 namespace HeuristicLab.Permutation {
     26namespace HeuristicLab.Encodings.Permutation {
    2727  /// <summary>
    2828  /// Manipulates a permutation array by swaping three randomly chosen elements.

  • trunk/sources/HeuristicLab.Encodings.Permutation/3.3/Tests/Auxiliary.cs

    r2854 r2906  
    2020#endregion
    2121
    22 using System;
    23 using System.Collections.Generic;
    24 using System.Linq;
    25 using System.Text;
    26 
    27 namespace HeuristicLab.Permutation.Tests {
     22namespace HeuristicLab.Encodings.Permutation.Tests {
    2823  public static class Auxiliary {
    2924    public static bool PermutationIsEqualByPosition(Permutation p1, Permutation p2) {

  • trunk/sources/HeuristicLab.Encodings.Permutation/3.3/Tests/CosaCrossoverTest.cs

    r2879 r2906  
    2020#endregion
    2121
    22 using HeuristicLab.Permutation;
     22using HeuristicLab.Core;
    2323using Microsoft.VisualStudio.TestTools.UnitTesting;
    24 using HeuristicLab.Core;
    2524
    26 namespace HeuristicLab.Permutation.Tests
    27 {
    28    
    29    
     25namespace HeuristicLab.Encodings.Permutation.Tests {
    3026    /// <summary>
    3127    ///This is a test class for CosaCrossoverTest and is intended
    … …  
    8682    ///</summary>
    8783    [TestMethod()]
    88     [DeploymentItem("HeuristicLab.Permutation-3.3.dll")]
     84    [DeploymentItem("HeuristicLab.Encodings.Permutation-3.3.dll")]
    8985    public void CosaCrossoverCrossTest() {
    9086      TestRandom random = new TestRandom();

  • trunk/sources/HeuristicLab.Encodings.Permutation/3.3/Tests/CyclicCrossover2Test.cs

    r2871 r2906  
    1 using HeuristicLab.Permutation;
     1using HeuristicLab.Core;
    22using Microsoft.VisualStudio.TestTools.UnitTesting;
    3 using HeuristicLab.Core;
    43
    5 namespace HeuristicLab.Permutation.Tests
    6 {
    7    
    8    
     4namespace HeuristicLab.Encodings.Permutation.Tests {
    95    /// <summary>
    106    ///This is a test class for CyclicCrossover2Test and is intended
    … …  
    6561    ///</summary>
    6662    [TestMethod()]
    67     [DeploymentItem("HeuristicLab.Permutation-3.3.dll")]
     63    [DeploymentItem("HeuristicLab.Encodings.Permutation-3.3.dll")]
    6864    public void CyclicCrossover2CrossTest() {
    6965      TestRandom random = new TestRandom();

  • trunk/sources/HeuristicLab.Encodings.Permutation/3.3/Tests/CyclicCrossoverTest.cs

    r2871 r2906  
    2020#endregion
    2121
    22 using HeuristicLab.Permutation;
     22using HeuristicLab.Core;
    2323using Microsoft.VisualStudio.TestTools.UnitTesting;
    24 using HeuristicLab.Core;
    2524
    26 namespace HeuristicLab.Permutation.Tests {
    27 
    28 
     25namespace HeuristicLab.Encodings.Permutation.Tests {
    2926  /// <summary>
    3027  ///This is a test class for CyclicCrossover and is intended
    … …  
    8582    ///</summary>
    8683    [TestMethod()]
    87     [DeploymentItem("HeuristicLab.Permutation-3.3.dll")]
     84    [DeploymentItem("HeuristicLab.Encodings.Permutation-3.3.dll")]
    8885    public void CyclicCrossoverCrossTest() {
    8986      TestRandom random = new TestRandom();

  • trunk/sources/HeuristicLab.Encodings.Permutation/3.3/Tests/EdgeRecombinationCrossoverTest.cs

    r2854 r2906  
    2020#endregion
    2121
    22 using HeuristicLab.Permutation;
     22using HeuristicLab.Core;
    2323using Microsoft.VisualStudio.TestTools.UnitTesting;
    24 using HeuristicLab.Core;
    2524
    26 namespace HeuristicLab.Permutation.Tests {
    27 
    28 
     25namespace HeuristicLab.Encodings.Permutation.Tests {
    2926  /// <summary>
    3027  ///This is a test class for EdgeRecombinationCrossover and is intended
    … …  
    8582    ///</summary>
    8683    [TestMethod()]
    87     [DeploymentItem("HeuristicLab.Permutation-3.3.dll")]
     84    [DeploymentItem("HeuristicLab.Encodings.Permutation-3.3.dll")]
    8885    public void EdgeRecombinationCrossoverCrossoverCrossTest() {
    8986      TestRandom random = new TestRandom();

  • trunk/sources/HeuristicLab.Encodings.Permutation/3.3/Tests/HeuristicLab.Encodings.Permutation-3.3.Tests.csproj

    r2903 r2906  
    88    <OutputType>Library</OutputType>
    99    <AppDesignerFolder>Properties</AppDesignerFolder>
    10     <RootNamespace>HeuristicLab.Permutation.Tests</RootNamespace>
    11     <AssemblyName>HeuristicLab.Permutation-3.3.Tests</AssemblyName>
     10    <RootNamespace>HeuristicLab.Encodings.Permutation.Tests</RootNamespace>
     11    <AssemblyName>HeuristicLab.Encodings.Permutation-3.3.Tests</AssemblyName>
    1212    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
    1313    <FileAlignment>512</FileAlignment>
    … …  
    135135      <Name>HeuristicLab.PluginInfrastructure</Name>
    136136    </ProjectReference>
    137     <ProjectReference Include="..\HeuristicLab.Permutation-3.3.csproj">
     137    <ProjectReference Include="..\HeuristicLab.Encodings.Permutation-3.3.csproj">
    138138      <Project>{00282156-589D-424F-9CE4-A8038636C926}</Project>
    139       <Name>HeuristicLab.Permutation-3.3</Name>
     139      <Name>HeuristicLab.Encodings.Permutation-3.3</Name>
    140140    </ProjectReference>
    141141  </ItemGroup>

  • trunk/sources/HeuristicLab.Encodings.Permutation/3.3/Tests/InsertionManipulatorTest.cs

    r2854 r2906  
    2020#endregion
    2121
    22 using HeuristicLab.Permutation;
    2322using Microsoft.VisualStudio.TestTools.UnitTesting;
    24 using HeuristicLab.Core;
    2523
    26 namespace HeuristicLab.Permutation.Tests {
    27 
    28 
     24namespace HeuristicLab.Encodings.Permutation.Tests {
    2925  /// <summary>
    3026  ///This is a test class for InsertionManipulator and is intended

  • trunk/sources/HeuristicLab.Encodings.Permutation/3.3/Tests/InversionManipulatorTest.cs

    r2854 r2906  
    2020#endregion
    2121
    22 using HeuristicLab.Permutation;
    2322using Microsoft.VisualStudio.TestTools.UnitTesting;
    24 using HeuristicLab.Core;
    2523
    26 namespace HeuristicLab.Permutation.Tests {
    27 
    28 
     24namespace HeuristicLab.Encodings.Permutation.Tests {
    2925  /// <summary>
    3026  ///This is a test class for InversionManipulator and is intended

  • trunk/sources/HeuristicLab.Encodings.Permutation/3.3/Tests/MaximalPreservativeCrossoverTest.cs

    r2867 r2906  
    2020#endregion
    2121
    22 using HeuristicLab.Permutation;
     22using HeuristicLab.Core;
    2323using Microsoft.VisualStudio.TestTools.UnitTesting;
    24 using HeuristicLab.Core;
    2524
    26 namespace HeuristicLab.Permutation.Tests {
    27 
    28 
     25namespace HeuristicLab.Encodings.Permutation.Tests {
    2926  /// <summary>
    3027  ///This is a test class for MaximalPreservativeCrossover and is intended
    … …  
    8582    ///</summary>
    8683    [TestMethod()]
    87     [DeploymentItem("HeuristicLab.Permutation-3.3.dll")]
     84    [DeploymentItem("HeuristicLab.Encodings.Permutation-3.3.dll")]
    8885    public void MaximalPreservativeCrossoverCrossTest() {
    8986      TestRandom random = new TestRandom();

  • trunk/sources/HeuristicLab.Encodings.Permutation/3.3/Tests/OrderBasedCrossoverTest.cs

    r2854 r2906  
    2020#endregion
    2121
    22 using HeuristicLab.Permutation;
     22using HeuristicLab.Core;
    2323using Microsoft.VisualStudio.TestTools.UnitTesting;
    24 using HeuristicLab.Core;
    2524
    26 namespace HeuristicLab.Permutation.Tests
    27 {
    28    
    29    
     25namespace HeuristicLab.Encodings.Permutation.Tests {
    3026    /// <summary>
    3127    ///This is a test class for OrderBasedCrossoverTest and is intended
    … …  
    8682    ///</summary>
    8783    [TestMethod()]
    88     [DeploymentItem("HeuristicLab.Permutation-3.3.dll")]
     84    [DeploymentItem("HeuristicLab.Encodings.Permutation-3.3.dll")]
    8985    public void OrderBasedCrossoverCrossTest() {
    9086      TestRandom random = new TestRandom();

  • trunk/sources/HeuristicLab.Encodings.Permutation/3.3/Tests/OrderCrossover2Test.cs

    r2871 r2906  
    1 using HeuristicLab.Permutation;
     1using HeuristicLab.Core;
    22using Microsoft.VisualStudio.TestTools.UnitTesting;
    3 using HeuristicLab.Core;
    43
    5 namespace HeuristicLab.Permutation.Tests
    6 {
    7    
    8    
     4namespace HeuristicLab.Encodings.Permutation.Tests {
    95    /// <summary>
    106    ///This is a test class for OrderCrossover2Test and is intended
    … …  
    6561    ///</summary>
    6662    [TestMethod()]
    67     [DeploymentItem("HeuristicLab.Permutation-3.3.dll")]
     63    [DeploymentItem("HeuristicLab.Encodings.Permutation-3.3.dll")]
    6864    public void OrderCrossover2CrossTest() {
    6965      TestRandom random = new TestRandom();

  • trunk/sources/HeuristicLab.Encodings.Permutation/3.3/Tests/OrderCrossoverTest.cs

    r2871 r2906  
    2020#endregion
    2121
    22 using HeuristicLab.Permutation;
     22using HeuristicLab.Core;
    2323using Microsoft.VisualStudio.TestTools.UnitTesting;
    24 using HeuristicLab.Core;
    2524
    26 namespace HeuristicLab.Permutation.Tests
    27 {
    28    
    29    
     25namespace HeuristicLab.Encodings.Permutation.Tests {
    3026    /// <summary>
    3127    ///This is a test class for OrderCrossoverTest and is intended
    … …  
    8682    ///</summary>
    8783    [TestMethod()]
    88     [DeploymentItem("HeuristicLab.Permutation-3.3.dll")]
     84    [DeploymentItem("HeuristicLab.Encodings.Permutation-3.3.dll")]
    8985    public void OrderCrossoverCrossTest() {
    9086      TestRandom random = new TestRandom();

  • trunk/sources/HeuristicLab.Encodings.Permutation/3.3/Tests/PartiallyMatchedCrossoverTest.cs

    r2867 r2906  
    2020#endregion
    2121
    22 using HeuristicLab.Permutation;
     22using HeuristicLab.Core;
    2323using Microsoft.VisualStudio.TestTools.UnitTesting;
    24 using HeuristicLab.Core;
    2524
    26 namespace HeuristicLab.Permutation.Tests {
    27 
    28 
     25namespace HeuristicLab.Encodings.Permutation.Tests {
    2926  /// <summary>
    3027  ///This is a test class for PartiallyMatchedCrossover and is intended
    … …  
    8582    ///</summary>
    8683    [TestMethod()]
    87     [DeploymentItem("HeuristicLab.Permutation-3.3.dll")]
     84    [DeploymentItem("HeuristicLab.Encodings.Permutation-3.3.dll")]
    8885    public void PartiallyMatchedCrossTest() {
    8986      TestRandom random = new TestRandom();

  • trunk/sources/HeuristicLab.Encodings.Permutation/3.3/Tests/PositionBasedCrossoverTest.cs

    r2854 r2906  
    2020#endregion
    2121
    22 using HeuristicLab.Permutation;
     22using HeuristicLab.Core;
    2323using Microsoft.VisualStudio.TestTools.UnitTesting;
    24 using HeuristicLab.Core;
    2524
    26 namespace HeuristicLab.Permutation.Tests {
     25namespace HeuristicLab.Encodings.Permutation.Tests {
    2726  /// <summary>
    2827  ///This is a test class for PositionBasedCrossover and is intended
    … …  
    8382    ///</summary>
    8483    [TestMethod()]
    85     [DeploymentItem("HeuristicLab.Permutation-3.3.dll")]
     84    [DeploymentItem("HeuristicLab.Encodings.Permutation-3.3.dll")]
    8685    public void PositionBasedCrossoverCrossTest() {
    8786      TestRandom random = new TestRandom();
    … …  
    106105    ///</summary>
    107106    [TestMethod()]
    108     [DeploymentItem("HeuristicLab.Permutation-3.3.dll")]
     107    [DeploymentItem("HeuristicLab.Encodings.Permutation-3.3.dll")]
    109108    public void PositionBasedCrossoverApplyTest() {
    110109      TestRandom random = new TestRandom();

  • trunk/sources/HeuristicLab.Encodings.Permutation/3.3/Tests/Properties/AssemblyInfo.cs

    r2836 r2906  
    11using System.Reflection;
    2 using System.Runtime.CompilerServices;
    32using System.Runtime.InteropServices;
    43
    … …  
    65// set of attributes. Change these attribute values to modify the information
    76// associated with an assembly.
    8 [assembly: AssemblyTitle("HeuristicLab.Permutation-3.3.Tests")]
    9 [assembly: AssemblyDescription("")]
     7[assembly: AssemblyTitle("HeuristicLab.Encodings.Permutation-3.3.Tests")]
     8[assembly: AssemblyDescription("Unit tests for the HeuristicLab permutation encoding and related operators.")]
    109[assembly: AssemblyConfiguration("")]
    1110[assembly: AssemblyCompany("")]
    12 [assembly: AssemblyProduct("HeuristicLab.Permutation-3.3.Tests")]
    13 [assembly: AssemblyCopyright("Copyright © HEAL 2010")]
     11[assembly: AssemblyProduct("HeuristicLab")]
     12[assembly: AssemblyCopyright("(c) 2002-2010 HEAL")]
    1413[assembly: AssemblyTrademark("")]
    1514[assembly: AssemblyCulture("")]
    … …  
    3231// You can specify all the values or you can default the Revision and Build Numbers
    3332// by using the '*' as shown below:
    34 [assembly: AssemblyVersion("1.0.0.0")]
    35 [assembly: AssemblyFileVersion("1.0.0.0")]
     33[assembly: AssemblyVersion("3.3.0.0")]
     34[assembly: AssemblyFileVersion("3.3.0.0")]

  • trunk/sources/HeuristicLab.Encodings.Permutation/3.3/Tests/Random.cs

    r2854 r2906  
    2121
    2222using System;
    23 using System.Collections.Generic;
    24 using System.Linq;
    25 using System.Text;
    2623using HeuristicLab.Core;
    2724
    28 namespace HeuristicLab.Permutation.Tests {
     25namespace HeuristicLab.Encodings.Permutation.Tests {
    2926  public class TestRandom : IRandom {
    3027    #region Variables and Properties

  • trunk/sources/HeuristicLab.Encodings.Permutation/3.3/Tests/ScrambleManipulatorTest.cs

    r2854 r2906  
    2020#endregion
    2121
    22 using HeuristicLab.Permutation;
    2322using Microsoft.VisualStudio.TestTools.UnitTesting;
    24 using HeuristicLab.Core;
    2523
    26 namespace HeuristicLab.Permutation.Tests {
    27 
    28 
     24namespace HeuristicLab.Encodings.Permutation.Tests {
    2925  /// <summary>
    3026  ///This is a test class for ScrambleManipulator and is intended

  • trunk/sources/HeuristicLab.Encodings.Permutation/3.3/Tests/Swap2ManipulatorTest.cs

    r2854 r2906  
    2020#endregion
    2121
    22 using HeuristicLab.Permutation;
    2322using Microsoft.VisualStudio.TestTools.UnitTesting;
    24 using HeuristicLab.Core;
    2523
    26 namespace HeuristicLab.Permutation.Tests {
    27 
    28 
     24namespace HeuristicLab.Encodings.Permutation.Tests {
    2925  /// <summary>
    3026  ///This is a test class for Swap2Manipulator and is intended

  • trunk/sources/HeuristicLab.Encodings.Permutation/3.3/Tests/Swap3ManipulatorTest.cs

    r2854 r2906  
    2020#endregion
    2121
    22 using HeuristicLab.Permutation;
    2322using Microsoft.VisualStudio.TestTools.UnitTesting;
    24 using HeuristicLab.Core;
    2523
    26 namespace HeuristicLab.Permutation.Tests {
    27 
    28 
     24namespace HeuristicLab.Encodings.Permutation.Tests {
    2925  /// <summary>
    3026  ///This is a test class for Swap3Manipulator and is intended

  • trunk/sources/HeuristicLab.Encodings.Permutation/3.3/Tests/Test References/HeuristicLab.Permutation-3.3.accessor

    r2836 r2906  
    1 HeuristicLab.Permutation-3.3.dll
     1HeuristicLab.Encodings.Permutation-3.3.dll
    22Desktop

  • trunk/sources/HeuristicLab.Encodings.Permutation/3.3/Tests/TranslocationInversionManipulatorTest.cs

    r2854 r2906  
    2020#endregion
    2121
    22 using HeuristicLab.Permutation;
    2322using Microsoft.VisualStudio.TestTools.UnitTesting;
    24 using HeuristicLab.Core;
    2523
    26 namespace HeuristicLab.Permutation.Tests {
    27 
    28 
     24namespace HeuristicLab.Encodings.Permutation.Tests {
    2925  /// <summary>
    3026  ///This is a test class for TranslocationInversionManipulator and is intended

  • trunk/sources/HeuristicLab.Encodings.Permutation/3.3/Tests/TranslocationManipulatorTest.cs

    r2854 r2906  
    2020#endregion
    2121
    22 using HeuristicLab.Permutation;
    2322using Microsoft.VisualStudio.TestTools.UnitTesting;
    24 using HeuristicLab.Core;
    2523
    26 namespace HeuristicLab.Permutation.Tests {
    27 
    28 
     24namespace HeuristicLab.Encodings.Permutation.Tests {
    2925  /// <summary>
    3026  ///This is a test class for TranslocationManipulator and is intended

  • trunk/sources/HeuristicLab.Encodings.Permutation/3.3/TranslocationInversionManipulator.cs

    r2871 r2906  
    2020#endregion
    2121
    22 using System;
    2322using HeuristicLab.Core;
    2423using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    2524
    26 namespace HeuristicLab.Permutation {
     25namespace HeuristicLab.Encodings.Permutation {
    2726  /// <summary>
    2827  /// Manipulates a permutation array by moving and reversing a randomly chosen interval of elements to another

  • trunk/sources/HeuristicLab.Encodings.Permutation/3.3/TranslocationManipulator.cs

    r2871 r2906  
    2020#endregion
    2121
    22 using System;
    2322using HeuristicLab.Core;
    2423using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    2524
    26 namespace HeuristicLab.Permutation {
     25namespace HeuristicLab.Encodings.Permutation {
    2726  /// <summary>
    2827  /// Manipulates a permutation array by moving a randomly chosen interval of elements to another

  • trunk/sources/HeuristicLab.Problems.TSP/3.3/HeuristicLab.Problems.TSP-3.3.csproj

    r2900 r2906  
    111111      <Name>HeuristicLab.Data-3.3</Name>
    112112    </ProjectReference>
     113    <ProjectReference Include="..\..\HeuristicLab.Encodings.Permutation\3.3\HeuristicLab.Encodings.Permutation-3.3.csproj">
     114      <Project>{00282156-589D-424F-9CE4-A8038636C926}</Project>
     115      <Name>HeuristicLab.Encodings.Permutation-3.3</Name>
     116    </ProjectReference>
    113117    <ProjectReference Include="..\..\HeuristicLab.Operators\3.3\HeuristicLab.Operators-3.3.csproj">
    114118      <Project>{23DA7FF4-D5B8-41B6-AA96-F0561D24F3EE}</Project>
    … …  
    122126      <Project>{56F9106A-079F-4C61-92F6-86A84C2D84B7}</Project>
    123127      <Name>HeuristicLab.Parameters-3.3</Name>
    124     </ProjectReference>
    125     <ProjectReference Include="..\..\HeuristicLab.Permutation\3.3\HeuristicLab.Permutation-3.3.csproj">
    126       <Project>{00282156-589D-424F-9CE4-A8038636C926}</Project>
    127       <Name>HeuristicLab.Permutation-3.3</Name>
    128128    </ProjectReference>
    129129    <ProjectReference Include="..\..\HeuristicLab.Persistence\3.3\HeuristicLab.Persistence-3.3.csproj">

  • trunk/sources/HeuristicLab.Problems.TSP/3.3/HeuristicLabProblemsTSPPlugin.cs.frame

    r2883 r2906  
    3232  [PluginDependency("HeuristicLab.Core", "3.3")]
    3333  [PluginDependency("HeuristicLab.Data", "3.3")]
     34  [PluginDependency("HeuristicLab.Encodings.Permutation", "3.3")]
    3435  [PluginDependency("HeuristicLab.Operators", "3.3")]
    3536  [PluginDependency("HeuristicLab.Optimization", "3.3")]
    3637  [PluginDependency("HeuristicLab.Parameters", "3.3")]
    37   [PluginDependency("HeuristicLab.Permutation", "3.3")]
    3838  [PluginDependency("HeuristicLab.Persistence", "3.3")]
    3939  public class HeuristicLabProblemsTSPPlugin : PluginBase {

  • trunk/sources/HeuristicLab.Problems.TSP/3.3/TSP.cs

    r2891 r2906  
    2525using HeuristicLab.Core;
    2626using HeuristicLab.Data;
     27using HeuristicLab.Encodings.Permutation;
    2728using HeuristicLab.Optimization;
    2829using HeuristicLab.Parameters;
    29 using HeuristicLab.Permutation;
    3030using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    3131using HeuristicLab.PluginInfrastructure;

  • trunk/sources/HeuristicLab.Problems.TSP/3.3/TSPDistanceMatrixPathEvaluator.cs

    r2883 r2906  
    2222using HeuristicLab.Core;
    2323using HeuristicLab.Data;
     24using HeuristicLab.Encodings.Permutation;
    2425using HeuristicLab.Parameters;
    2526using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    … …  
    3637      get { return (LookupParameter<DoubleMatrixData>)Parameters["DistanceMatrix"]; }
    3738    }
    38     public LookupParameter<Permutation.Permutation> PermutationParameter {
    39       get { return (LookupParameter<Permutation.Permutation>)Parameters["Permutation"]; }
     39    public LookupParameter<Permutation> PermutationParameter {
     40      get { return (LookupParameter<Permutation>)Parameters["Permutation"]; }
    4041    }
    4142
    … …  
    4344      : base() {
    4445      Parameters.Add(new LookupParameter<DoubleMatrixData>("DistanceMatrix", "The distance matrix of the cities."));
    45       Parameters.Add(new LookupParameter<Permutation.Permutation>("Permutation", "The TSP solution given in path representation which should be evaluated."));
     46      Parameters.Add(new LookupParameter<Permutation>("Permutation", "The TSP solution given in path representation which should be evaluated."));
    4647    }
    4748
    4849    public override IOperation Apply() {
    4950      DoubleMatrixData distanceMatrix = DistanceMatrixParameter.ActualValue;
    50       Permutation.Permutation permutation = PermutationParameter.ActualValue;
     51      Permutation permutation = PermutationParameter.ActualValue;
    5152
    5253      double length = 0;

  • trunk/sources/HeuristicLab.Problems.TSP/3.3/TSPPathEvaluator.cs

    r2883 r2906  
    2222using HeuristicLab.Core;
    2323using HeuristicLab.Data;
     24using HeuristicLab.Encodings.Permutation;
    2425using HeuristicLab.Parameters;
    2526using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    … …  
    3536      get { return (LookupParameter<DoubleMatrixData>)Parameters["Coordinates"]; }
    3637    }
    37     public LookupParameter<Permutation.Permutation> PermutationParameter {
    38       get { return (LookupParameter<Permutation.Permutation>)Parameters["Permutation"]; }
     38    public LookupParameter<Permutation> PermutationParameter {
     39      get { return (LookupParameter<Permutation>)Parameters["Permutation"]; }
    3940    }
    4041
    … …  
    4243      : base() {
    4344      Parameters.Add(new LookupParameter<DoubleMatrixData>("Coordinates", "The x- and y-Coordinates of the cities."));
    44       Parameters.Add(new LookupParameter<Permutation.Permutation>("Permutation", "The TSP solution given in path representation which should be evaluated."));
     45      Parameters.Add(new LookupParameter<Permutation>("Permutation", "The TSP solution given in path representation which should be evaluated."));
    4546    }
    4647
    4748    public override IOperation Apply() {
    4849      DoubleMatrixData coordinates = CoordinatesParameter.ActualValue;
    49       Permutation.Permutation permutation = PermutationParameter.ActualValue;
     50      Permutation permutation = PermutationParameter.ActualValue;
    5051
    5152      double length = 0;
Note: See TracChangeset for help on using the changeset viewer.