Changeset 5785


Ignore:
Timestamp:
03/22/11 01:56:25 (11 years ago)
Author:
abeham
Message:

#1330

  • Added Swap2 move to permutation (+tabu search operators)
  • Added move evaluators for QAP (translocation/insertion missing)
  • Merged trunk-changes from Optimization into QAP branch
Location:
branches/QAP
Files:
20 added
15 edited
3 copied

Legend:

Unmodified
Added
Removed
  • branches/QAP/HeuristicLab.Analysis.Views/3.3/HeuristicLab.Analysis.Views-3.3.csproj

    r5723 r5785  
    257257SubWCRev "%25ProjectDir%25\" "%25ProjectDir%25\HeuristicLabAnalysisViewsPlugin.cs.frame" "%25ProjectDir%25\HeuristicLabAnalysisViewsPlugin.cs"</PreBuildEvent>
    258258  </PropertyGroup>
     259  <PropertyGroup>
     260    <PostBuildEvent>copy "$(TargetPath)" "C:\Program Files\HeuristicLab 3.3\"</PostBuildEvent>
     261  </PropertyGroup>
    259262</Project>
  • branches/QAP/HeuristicLab.Analysis/3.3/HeuristicLab.Analysis-3.3.csproj

    r5723 r5785  
    221221SubWCRev "%25ProjectDir%25\" "%25ProjectDir%25\HeuristicLabAnalysisPlugin.cs.frame" "%25ProjectDir%25\HeuristicLabAnalysisPlugin.cs"</PreBuildEvent>
    222222  </PropertyGroup>
     223  <PropertyGroup>
     224    <PostBuildEvent>copy "$(TargetPath)" "C:\Program Files\HeuristicLab 3.3\"</PostBuildEvent>
     225  </PropertyGroup>
    223226</Project>
  • branches/QAP/HeuristicLab.Encodings.PermutationEncoding.Views/3.3/HeuristicLab.Encodings.PermutationEncoding.Views-3.3.csproj

    r5163 r5785  
    1212    <AssemblyName>HeuristicLab.Encodings.PermutationEncoding.Views-3.3</AssemblyName>
    1313    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
    14     <TargetFrameworkProfile></TargetFrameworkProfile>
     14    <TargetFrameworkProfile>
     15    </TargetFrameworkProfile>
    1516    <FileAlignment>512</FileAlignment>
    1617    <SignAssembly>true</SignAssembly>
     
    9293  </PropertyGroup>
    9394  <ItemGroup>
     95    <Reference Include="HeuristicLab.Common-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=x86">
     96      <HintPath>..\..\..\..\..\..\..\..\Program Files\HeuristicLab 3.3\HeuristicLab.Common-3.3.dll</HintPath>
     97    </Reference>
     98    <Reference Include="HeuristicLab.Core-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=x86">
     99      <HintPath>..\..\..\..\..\..\..\..\Program Files\HeuristicLab 3.3\HeuristicLab.Core-3.3.dll</HintPath>
     100    </Reference>
     101    <Reference Include="HeuristicLab.Core.Views-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=x86">
     102      <HintPath>..\..\..\..\..\..\..\..\Program Files\HeuristicLab 3.3\HeuristicLab.Core.Views-3.3.dll</HintPath>
     103    </Reference>
     104    <Reference Include="HeuristicLab.Data-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=x86">
     105      <HintPath>..\..\..\..\..\..\..\..\Program Files\HeuristicLab 3.3\HeuristicLab.Data-3.3.dll</HintPath>
     106    </Reference>
     107    <Reference Include="HeuristicLab.MainForm-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=x86">
     108      <HintPath>..\..\..\..\..\..\..\..\Program Files\HeuristicLab 3.3\HeuristicLab.MainForm-3.3.dll</HintPath>
     109    </Reference>
     110    <Reference Include="HeuristicLab.MainForm.WindowsForms-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=x86">
     111      <HintPath>..\..\..\..\..\..\..\..\Program Files\HeuristicLab 3.3\HeuristicLab.MainForm.WindowsForms-3.3.dll</HintPath>
     112    </Reference>
     113    <Reference Include="HeuristicLab.PluginInfrastructure-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=x86">
     114      <HintPath>..\..\..\..\..\..\..\..\Program Files\HeuristicLab 3.3\HeuristicLab.PluginInfrastructure-3.3.dll</HintPath>
     115    </Reference>
    94116    <Reference Include="System" />
    95117    <Reference Include="System.Core">
     
    123145  </ItemGroup>
    124146  <ItemGroup>
    125     <ProjectReference Include="..\..\HeuristicLab.Common\3.3\HeuristicLab.Common-3.3.csproj">
    126       <Project>{A9AD58B9-3EF9-4CC1-97E5-8D909039FF5C}</Project>
    127       <Name>HeuristicLab.Common-3.3</Name>
    128     </ProjectReference>
    129     <ProjectReference Include="..\..\HeuristicLab.Core.Views\3.3\HeuristicLab.Core.Views-3.3.csproj">
    130       <Project>{E226881D-315F-423D-B419-A766FE0D8685}</Project>
    131       <Name>HeuristicLab.Core.Views-3.3</Name>
    132     </ProjectReference>
    133     <ProjectReference Include="..\..\HeuristicLab.Core\3.3\HeuristicLab.Core-3.3.csproj">
    134       <Project>{C36BD924-A541-4A00-AFA8-41701378DDC5}</Project>
    135       <Name>HeuristicLab.Core-3.3</Name>
    136     </ProjectReference>
    137     <ProjectReference Include="..\..\HeuristicLab.Data\3.3\HeuristicLab.Data-3.3.csproj">
    138       <Project>{BBAB9DF5-5EF3-4BA8-ADE9-B36E82114937}</Project>
    139       <Name>HeuristicLab.Data-3.3</Name>
    140     </ProjectReference>
    141147    <ProjectReference Include="..\..\HeuristicLab.Encodings.PermutationEncoding\3.3\HeuristicLab.Encodings.PermutationEncoding-3.3.csproj">
    142148      <Project>{DBECB8B0-B166-4133-BAF1-ED67C3FD7FCA}</Project>
    143149      <Name>HeuristicLab.Encodings.PermutationEncoding-3.3</Name>
    144     </ProjectReference>
    145     <ProjectReference Include="..\..\HeuristicLab.MainForm.WindowsForms\3.3\HeuristicLab.MainForm.WindowsForms-3.3.csproj">
    146       <Project>{AB687BBE-1BFE-476B-906D-44237135431D}</Project>
    147       <Name>HeuristicLab.MainForm.WindowsForms-3.3</Name>
    148     </ProjectReference>
    149     <ProjectReference Include="..\..\HeuristicLab.MainForm\3.3\HeuristicLab.MainForm-3.3.csproj">
    150       <Project>{3BD61258-31DA-4B09-89C0-4F71FEF5F05A}</Project>
    151       <Name>HeuristicLab.MainForm-3.3</Name>
    152     </ProjectReference>
    153     <ProjectReference Include="..\..\HeuristicLab.PluginInfrastructure\3.3\HeuristicLab.PluginInfrastructure-3.3.csproj">
    154       <Project>{94186A6A-5176-4402-AE83-886557B53CCA}</Project>
    155       <Name>HeuristicLab.PluginInfrastructure-3.3</Name>
    156150    </ProjectReference>
    157151  </ItemGroup>
     
    190184SubWCRev "%25ProjectDir%25\" "%25ProjectDir%25\HeuristicLabEncodingsPermutationEncodingViewsPlugin.cs.frame" "%25ProjectDir%25\HeuristicLabEncodingsPermutationEncodingViewsPlugin.cs"</PreBuildEvent>
    191185  </PropertyGroup>
     186  <PropertyGroup>
     187    <PostBuildEvent>copy "$(TargetPath)" "C:\Program Files\HeuristicLab 3.3\"</PostBuildEvent>
     188  </PropertyGroup>
    192189</Project>
  • branches/QAP/HeuristicLab.Encodings.PermutationEncoding.Views/3.3/HeuristicLabEncodingsPermutationEncodingViewsPlugin.cs.frame

    r5446 r5785  
    2828  [Plugin("HeuristicLab.Encodings.PermutationEncoding.Views", "3.3.3.$WCREV$")]
    2929  [PluginFile("HeuristicLab.Encodings.PermutationEncoding.Views-3.3.dll", PluginFileType.Assembly)]
     30  [PluginDependency("HeuristicLab.Common", "3.3")]
    3031  [PluginDependency("HeuristicLab.Core", "3.3")]
    3132  [PluginDependency("HeuristicLab.Core.Views", "3.3")]
  • branches/QAP/HeuristicLab.Encodings.PermutationEncoding/3.3/HeuristicLab.Encodings.PermutationEncoding-3.3.csproj

    r5163 r5785  
    1919    </UpgradeBackupLocation>
    2020    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
    21     <TargetFrameworkProfile></TargetFrameworkProfile>
     21    <TargetFrameworkProfile>
     22    </TargetFrameworkProfile>
    2223    <PublishUrl>publish\</PublishUrl>
    2324    <Install>true</Install>
     
    9697  </PropertyGroup>
    9798  <ItemGroup>
     99    <Reference Include="HeuristicLab.Collections-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=x86">
     100      <HintPath>..\..\..\..\..\..\..\..\Program Files\HeuristicLab 3.3\HeuristicLab.Collections-3.3.dll</HintPath>
     101    </Reference>
     102    <Reference Include="HeuristicLab.Common-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=x86">
     103      <HintPath>..\..\..\..\..\..\..\..\Program Files\HeuristicLab 3.3\HeuristicLab.Common-3.3.dll</HintPath>
     104    </Reference>
     105    <Reference Include="HeuristicLab.Common.Resources-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=x86">
     106      <HintPath>..\..\..\..\..\..\..\..\Program Files\HeuristicLab 3.3\HeuristicLab.Common.Resources-3.3.dll</HintPath>
     107    </Reference>
     108    <Reference Include="HeuristicLab.Core-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=x86">
     109      <HintPath>..\..\..\..\..\..\..\..\Program Files\HeuristicLab 3.3\HeuristicLab.Core-3.3.dll</HintPath>
     110    </Reference>
     111    <Reference Include="HeuristicLab.Data-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=x86">
     112      <HintPath>..\..\..\..\..\..\..\..\Program Files\HeuristicLab 3.3\HeuristicLab.Data-3.3.dll</HintPath>
     113    </Reference>
     114    <Reference Include="HeuristicLab.Operators-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=x86">
     115      <HintPath>..\..\..\..\..\..\..\..\Program Files\HeuristicLab 3.3\HeuristicLab.Operators-3.3.dll</HintPath>
     116    </Reference>
     117    <Reference Include="HeuristicLab.Optimization.Operators-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=x86">
     118      <HintPath>..\..\..\..\..\..\..\..\Program Files\HeuristicLab 3.3\HeuristicLab.Optimization.Operators-3.3.dll</HintPath>
     119    </Reference>
     120    <Reference Include="HeuristicLab.Parameters-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=x86">
     121      <HintPath>..\..\..\..\..\..\..\..\Program Files\HeuristicLab 3.3\HeuristicLab.Parameters-3.3.dll</HintPath>
     122    </Reference>
     123    <Reference Include="HeuristicLab.Persistence-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=x86">
     124      <HintPath>..\..\..\..\..\..\..\..\Program Files\HeuristicLab 3.3\HeuristicLab.Persistence-3.3.dll</HintPath>
     125    </Reference>
     126    <Reference Include="HeuristicLab.PluginInfrastructure-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=x86">
     127      <HintPath>..\..\..\..\..\..\..\..\Program Files\HeuristicLab 3.3\HeuristicLab.PluginInfrastructure-3.3.dll</HintPath>
     128    </Reference>
    98129    <Reference Include="System" />
    99130    <Reference Include="System.Core">
     
    118149    <Compile Include="Crossovers\PositionBasedCrossover.cs" />
    119150    <Compile Include="HeuristicLabEncodingsPermutationEncodingPlugin.cs" />
     151    <Compile Include="Interfaces\IPermutationSwapMoveOperator.cs" />
    120152    <Compile Include="Interfaces\IPermutationCreator.cs" />
    121153    <Compile Include="Interfaces\IPermutationCrossover.cs" />
     
    133165    <Compile Include="Manipulators\TranslocationInversionManipulator.cs" />
    134166    <Compile Include="Manipulators\TranslocationManipulator.cs" />
     167    <Compile Include="Moves\Edge.cs" />
    135168    <Compile Include="Moves\PermutationMoveAttribute.cs" />
     169    <Compile Include="Moves\StandardEdgeEqualityComparer.cs" />
     170    <Compile Include="Moves\Swap\SwapMoveSoftTabuCriterion.cs" />
     171    <Compile Include="Moves\Swap\ExhaustiveSwapMoveGenerator.cs" />
     172    <Compile Include="Moves\Swap\StochasticSwapSingleMoveGenerator.cs" />
     173    <Compile Include="Moves\Swap\SwapMoveAbsoluteAttribute.cs" />
     174    <Compile Include="Moves\Swap\SwapMoveHardTabuCriterion.cs" />
     175    <Compile Include="Moves\Swap\SwapMoveMaker.cs" />
     176    <Compile Include="Moves\Swap\SwapMoveRelativeAttribute.cs" />
     177    <Compile Include="Moves\Swap\SwapMoveTabuMaker.cs" />
     178    <Compile Include="Moves\Swap\StochasticSwapMultiMoveGenerator.cs" />
     179    <Compile Include="Moves\Swap\SwapMoveGenerator.cs" />
     180    <Compile Include="Moves\Swap\SwapMove.cs" />
    136181    <Compile Include="Moves\ThreeIndexMove.cs" />
    137182    <Compile Include="Moves\ThreeOpt\StochasticSingleInsertionMoveGenerator.cs" />
     
    176221  </ItemGroup>
    177222  <ItemGroup>
    178     <ProjectReference Include="..\..\HeuristicLab.Collections\3.3\HeuristicLab.Collections-3.3.csproj">
    179       <Project>{958B43BC-CC5C-4FA2-8628-2B3B01D890B6}</Project>
    180       <Name>HeuristicLab.Collections-3.3</Name>
    181     </ProjectReference>
    182     <ProjectReference Include="..\..\HeuristicLab.Common.Resources\3.3\HeuristicLab.Common.Resources-3.3.csproj">
    183       <Project>{0E27A536-1C4A-4624-A65E-DC4F4F23E3E1}</Project>
    184       <Name>HeuristicLab.Common.Resources-3.3</Name>
    185     </ProjectReference>
    186     <ProjectReference Include="..\..\HeuristicLab.Common\3.3\HeuristicLab.Common-3.3.csproj">
    187       <Project>{A9AD58B9-3EF9-4CC1-97E5-8D909039FF5C}</Project>
    188       <Name>HeuristicLab.Common-3.3</Name>
    189     </ProjectReference>
    190     <ProjectReference Include="..\..\HeuristicLab.Core\3.3\HeuristicLab.Core-3.3.csproj">
    191       <Project>{C36BD924-A541-4A00-AFA8-41701378DDC5}</Project>
    192       <Name>HeuristicLab.Core-3.3</Name>
    193     </ProjectReference>
    194     <ProjectReference Include="..\..\HeuristicLab.Data\3.3\HeuristicLab.Data-3.3.csproj">
    195       <Project>{BBAB9DF5-5EF3-4BA8-ADE9-B36E82114937}</Project>
    196       <Name>HeuristicLab.Data-3.3</Name>
    197     </ProjectReference>
    198     <ProjectReference Include="..\..\HeuristicLab.Operators\3.3\HeuristicLab.Operators-3.3.csproj">
    199       <Project>{23DA7FF4-D5B8-41B6-AA96-F0561D24F3EE}</Project>
    200       <Name>HeuristicLab.Operators-3.3</Name>
    201     </ProjectReference>
    202     <ProjectReference Include="..\..\HeuristicLab.Optimization.Operators\3.3\HeuristicLab.Optimization.Operators-3.3.csproj">
    203       <Project>{25087811-F74C-4128-BC86-8324271DA13E}</Project>
    204       <Name>HeuristicLab.Optimization.Operators-3.3</Name>
    205     </ProjectReference>
    206223    <ProjectReference Include="..\..\HeuristicLab.Optimization\3.3\HeuristicLab.Optimization-3.3.csproj">
    207224      <Project>{14AB8D24-25BC-400C-A846-4627AA945192}</Project>
    208225      <Name>HeuristicLab.Optimization-3.3</Name>
    209     </ProjectReference>
    210     <ProjectReference Include="..\..\HeuristicLab.Parameters\3.3\HeuristicLab.Parameters-3.3.csproj">
    211       <Project>{56F9106A-079F-4C61-92F6-86A84C2D84B7}</Project>
    212       <Name>HeuristicLab.Parameters-3.3</Name>
    213     </ProjectReference>
    214     <ProjectReference Include="..\..\HeuristicLab.Persistence\3.3\HeuristicLab.Persistence-3.3.csproj">
    215       <Project>{102BC7D3-0EF9-439C-8F6D-96FF0FDB8E1B}</Project>
    216       <Name>HeuristicLab.Persistence-3.3</Name>
    217     </ProjectReference>
    218     <ProjectReference Include="..\..\HeuristicLab.PluginInfrastructure\3.3\HeuristicLab.PluginInfrastructure-3.3.csproj">
    219       <Project>{94186A6A-5176-4402-AE83-886557B53CCA}</Project>
    220       <Name>HeuristicLab.PluginInfrastructure-3.3</Name>
    221226    </ProjectReference>
    222227  </ItemGroup>
     
    238243    </BootstrapperPackage>
    239244  </ItemGroup>
     245  <ItemGroup />
    240246  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
    241247  <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
     
    255261SubWCRev "%25ProjectDir%25\" "%25ProjectDir%25\HeuristicLabEncodingsPermutationEncodingPlugin.cs.frame" "%25ProjectDir%25\HeuristicLabEncodingsPermutationEncodingPlugin.cs"</PreBuildEvent>
    256262  </PropertyGroup>
     263  <PropertyGroup>
     264    <PostBuildEvent>copy "$(TargetPath)" "C:\Program Files\HeuristicLab 3.3\"</PostBuildEvent>
     265  </PropertyGroup>
    257266</Project>
  • branches/QAP/HeuristicLab.Encodings.PermutationEncoding/3.3/Manipulators/Swap2Manipulator.cs

    r5445 r5785  
    4949    /// <param name="permutation">The permutation to manipulate.</param>
    5050    public static void Apply(IRandom random, Permutation permutation) {
    51       int index1, index2, temp;
     51      int index1, index2;
    5252
    5353      index1 = random.Next(permutation.Length);
    5454      index2 = random.Next(permutation.Length);
    5555
    56       temp = permutation[index1];
     56      Apply(permutation, index1, index2);
     57    }
     58
     59    public static void Apply(Permutation permutation, int index1, int index2) {
     60      int temp = permutation[index1];
    5761      permutation[index1] = permutation[index2];
    5862      permutation[index2] = temp;
  • branches/QAP/HeuristicLab.Encodings.PermutationEncoding/3.3/Tests/HeuristicLab.Encodings.PermutationEncoding-3.3.Tests.csproj

    r5163 r5785  
    9090  </PropertyGroup>
    9191  <ItemGroup>
     92    <Reference Include="HeuristicLab.Collections-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=x86">
     93      <HintPath>..\..\..\..\..\..\..\..\..\Program Files\HeuristicLab 3.3\HeuristicLab.Collections-3.3.dll</HintPath>
     94    </Reference>
     95    <Reference Include="HeuristicLab.Common-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=x86">
     96      <HintPath>..\..\..\..\..\..\..\..\..\Program Files\HeuristicLab 3.3\HeuristicLab.Common-3.3.dll</HintPath>
     97    </Reference>
     98    <Reference Include="HeuristicLab.Core-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=x86">
     99      <HintPath>..\..\..\..\..\..\..\..\..\Program Files\HeuristicLab 3.3\HeuristicLab.Core-3.3.dll</HintPath>
     100    </Reference>
     101    <Reference Include="HeuristicLab.Data-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=x86">
     102      <HintPath>..\..\..\..\..\..\..\..\..\Program Files\HeuristicLab 3.3\HeuristicLab.Data-3.3.dll</HintPath>
     103    </Reference>
     104    <Reference Include="HeuristicLab.Operators-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=x86">
     105      <HintPath>..\..\..\..\..\..\..\..\..\Program Files\HeuristicLab 3.3\HeuristicLab.Operators-3.3.dll</HintPath>
     106    </Reference>
    92107    <Reference Include="Microsoft.VisualStudio.QualityTools.UnitTestFramework, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />
    93108    <Reference Include="System" />
     
    125140  </ItemGroup>
    126141  <ItemGroup>
    127     <ProjectReference Include="..\..\..\HeuristicLab.Collections\3.3\HeuristicLab.Collections-3.3.csproj">
    128       <Project>{958B43BC-CC5C-4FA2-8628-2B3B01D890B6}</Project>
    129       <Name>HeuristicLab.Collections-3.3</Name>
    130     </ProjectReference>
    131     <ProjectReference Include="..\..\..\HeuristicLab.Common\3.3\HeuristicLab.Common-3.3.csproj">
    132       <Project>{A9AD58B9-3EF9-4CC1-97E5-8D909039FF5C}</Project>
    133       <Name>HeuristicLab.Common-3.3</Name>
    134     </ProjectReference>
    135     <ProjectReference Include="..\..\..\HeuristicLab.Core\3.3\HeuristicLab.Core-3.3.csproj">
    136       <Project>{C36BD924-A541-4A00-AFA8-41701378DDC5}</Project>
    137       <Name>HeuristicLab.Core-3.3</Name>
    138     </ProjectReference>
    139     <ProjectReference Include="..\..\..\HeuristicLab.Data\3.3\HeuristicLab.Data-3.3.csproj">
    140       <Project>{BBAB9DF5-5EF3-4BA8-ADE9-B36E82114937}</Project>
    141       <Name>HeuristicLab.Data-3.3</Name>
    142     </ProjectReference>
    143     <ProjectReference Include="..\..\..\HeuristicLab.Operators\3.3\HeuristicLab.Operators-3.3.csproj">
    144       <Project>{23DA7FF4-D5B8-41B6-AA96-F0561D24F3EE}</Project>
    145       <Name>HeuristicLab.Operators-3.3</Name>
    146     </ProjectReference>
    147142    <ProjectReference Include="..\..\..\HeuristicLab.Optimization\3.3\HeuristicLab.Optimization-3.3.csproj">
    148143      <Project>{14AB8D24-25BC-400C-A846-4627AA945192}</Project>
    149144      <Name>HeuristicLab.Optimization-3.3</Name>
    150     </ProjectReference>
    151     <ProjectReference Include="..\..\..\HeuristicLab.Parameters\3.3\HeuristicLab.Parameters-3.3.csproj">
    152       <Project>{56F9106A-079F-4C61-92F6-86A84C2D84B7}</Project>
    153       <Name>HeuristicLab.Parameters-3.3</Name>
    154     </ProjectReference>
    155     <ProjectReference Include="..\..\..\HeuristicLab.Persistence\3.3\HeuristicLab.Persistence-3.3.csproj">
    156       <Project>{102BC7D3-0EF9-439C-8F6D-96FF0FDB8E1B}</Project>
    157       <Name>HeuristicLab.Persistence-3.3</Name>
    158     </ProjectReference>
    159     <ProjectReference Include="..\..\..\HeuristicLab.PluginInfrastructure\3.3\HeuristicLab.PluginInfrastructure-3.3.csproj">
    160       <Project>{94186A6A-5176-4402-AE83-886557B53CCA}</Project>
    161       <Name>HeuristicLab.PluginInfrastructure-3.3</Name>
    162145    </ProjectReference>
    163146    <ProjectReference Include="..\HeuristicLab.Encodings.PermutationEncoding-3.3.csproj">
  • branches/QAP/HeuristicLab.Optimization/3.3

  • branches/QAP/HeuristicLab.Optimization/3.3/HeuristicLab.Optimization-3.3.csproj

    r5723 r5785  
    143143    <Compile Include="Interfaces\IDiscreteDoubleMatrixModifier.cs" />
    144144    <Compile Include="Interfaces\IGlobalParticleUpdater.cs" />
     145    <Compile Include="Interfaces\ILocalImprovementOperator.cs" />
    145146    <Compile Include="Interfaces\ILocalParticleUpdater.cs" />
    146147    <Compile Include="Interfaces\IMultiAnalyzer.cs" />
     
    247248SubWCRev "%25ProjectDir%25\" "%25ProjectDir%25\HeuristicLabOptimizationPlugin.cs.frame" "%25ProjectDir%25\HeuristicLabOptimizationPlugin.cs"</PreBuildEvent>
    248249  </PropertyGroup>
     250  <PropertyGroup>
     251    <PostBuildEvent>copy "$(TargetPath)" "C:\Program Files\HeuristicLab 3.3\"</PostBuildEvent>
     252  </PropertyGroup>
    249253</Project>
  • branches/QAP/HeuristicLab.Optimization/3.3/UserDefinedProblem.cs

    r5445 r5785  
    3131using HeuristicLab.Parameters;
    3232using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     33using HeuristicLab.PluginInfrastructure;
    3334
    3435namespace HeuristicLab.Optimization {
     
    222223    [Item("EmptyUserDefinedProblemEvaluator", "A dummy evaluator that will throw an exception when executed.")]
    223224    [StorableClass]
     225    [NonDiscoverableType]
    224226    private sealed class EmptyUserDefinedProblemEvaluator : ParameterizedNamedItem, ISingleObjectiveEvaluator {
    225227
  • branches/QAP/HeuristicLab.Problems.QuadraticAssignment.Views/3.3/HeuristicLab.Problems.QuadraticAssignment.Views-3.3.csproj

    r5723 r5785  
    117117      <HintPath>..\..\..\..\..\..\..\..\Program Files\HeuristicLab 3.3\HeuristicLab.Data-3.3.dll</HintPath>
    118118    </Reference>
    119     <Reference Include="HeuristicLab.Encodings.PermutationEncoding-3.3">
    120       <HintPath>..\..\..\..\..\..\..\..\Program Files\HeuristicLab 3.3\HeuristicLab.Encodings.PermutationEncoding-3.3.dll</HintPath>
    121     </Reference>
    122119    <Reference Include="HeuristicLab.MainForm-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=x86">
    123120      <HintPath>..\..\..\..\..\..\..\..\Program Files\HeuristicLab 3.3\HeuristicLab.MainForm-3.3.dll</HintPath>
     
    179176      <Name>HeuristicLab.Analysis-3.3</Name>
    180177    </ProjectReference>
     178    <ProjectReference Include="..\..\HeuristicLab.Encodings.PermutationEncoding\3.3\HeuristicLab.Encodings.PermutationEncoding-3.3.csproj">
     179      <Project>{DBECB8B0-B166-4133-BAF1-ED67C3FD7FCA}</Project>
     180      <Name>HeuristicLab.Encodings.PermutationEncoding-3.3</Name>
     181    </ProjectReference>
    181182    <ProjectReference Include="..\..\HeuristicLab.Optimization\3.3\HeuristicLab.Optimization-3.3.csproj">
    182183      <Project>{14AB8D24-25BC-400C-A846-4627AA945192}</Project>
  • branches/QAP/HeuristicLab.Problems.QuadraticAssignment/3.3/HeuristicLab.Problems.QuadraticAssignment-3.3.csproj

    r5723 r5785  
    117117      <HintPath>C:\Program Files\HeuristicLab 3.3\HeuristicLab.Data-3.3.dll</HintPath>
    118118    </Reference>
    119     <Reference Include="HeuristicLab.Encodings.PermutationEncoding-3.3">
    120       <HintPath>C:\Program Files\HeuristicLab 3.3\HeuristicLab.Encodings.PermutationEncoding-3.3.dll</HintPath>
    121     </Reference>
    122119    <Reference Include="HeuristicLab.Operators-3.3">
    123120      <HintPath>C:\Program Files\HeuristicLab 3.3\HeuristicLab.Operators-3.3.dll</HintPath>
     
    139136  <ItemGroup>
    140137    <Compile Include="Analyzers\BestQAPSolutionAnalyzer.cs" />
     138    <Compile Include="Evaluators\QAPSwapMoveEvaluator.cs" />
    141139    <Compile Include="Evaluators\QAPEvaluator.cs" />
     140    <Compile Include="Evaluators\QAPInversionMoveEvaluator.cs" />
     141    <Compile Include="Evaluators\QAPMoveEvaluator.cs" />
    142142    <Compile Include="Interfaces\IQAPEvaluator.cs" />
     143    <Compile Include="Interfaces\IQAPMoveEvaluator.cs" />
    143144    <Compile Include="Parsers\QAPLIBSolutionParser.cs" />
    144145    <Compile Include="Parsers\QAPLIBParser.cs" />
     
    409410  </ItemGroup>
    410411  <ItemGroup>
     412    <ProjectReference Include="..\..\HeuristicLab.Encodings.PermutationEncoding\3.3\HeuristicLab.Encodings.PermutationEncoding-3.3.csproj">
     413      <Project>{DBECB8B0-B166-4133-BAF1-ED67C3FD7FCA}</Project>
     414      <Name>HeuristicLab.Encodings.PermutationEncoding-3.3</Name>
     415    </ProjectReference>
    411416    <ProjectReference Include="..\..\HeuristicLab.Optimization\3.3\HeuristicLab.Optimization-3.3.csproj">
    412417      <Project>{14AB8D24-25BC-400C-A846-4627AA945192}</Project>
  • branches/QAP/HeuristicLab.Problems.QuadraticAssignment/3.3/QuadraticAssignmentProblem.cs

    r5648 r5785  
    267267        foreach (IPermutationTranslocationMoveOperator op in Operators.OfType<IPermutationTranslocationMoveOperator>())
    268268          op.TranslocationMoveParameter.ActualName = translocationMove;
     269        string swapMove = Operators.OfType<IMoveGenerator>().OfType<IPermutationSwapMoveOperator>().First().SwapMoveParameter.ActualName;
     270        foreach (IPermutationSwapMoveOperator op in Operators.OfType<IPermutationSwapMoveOperator>()) {
     271          op.SwapMoveParameter.ActualName = swapMove;
     272        }
    269273      }
    270274    }
  • branches/QAP/HeuristicLab.Problems.QuadraticAssignment/3.3/Tests/HeuristicLab.Problems.QuadraticAssignment.Tests-3.3.csproj

    r5648 r5785  
    9595  </PropertyGroup>
    9696  <ItemGroup>
     97    <Reference Include="HeuristicLab.Collections-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=x86" />
    9798    <Reference Include="HeuristicLab.Common-3.3">
    9899      <HintPath>C:\Program Files\HeuristicLab 3.3\HeuristicLab.Common-3.3.dll</HintPath>
    99100    </Reference>
     101    <Reference Include="HeuristicLab.Common.Resources-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=x86" />
    100102    <Reference Include="HeuristicLab.Core-3.3">
    101103      <HintPath>C:\Program Files\HeuristicLab 3.3\HeuristicLab.Core-3.3.dll</HintPath>
    102104    </Reference>
     105    <Reference Include="HeuristicLab.Data-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=x86" />
     106    <Reference Include="HeuristicLab.Operators-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=x86" />
    103107    <Reference Include="HeuristicLab.Optimization-3.3">
    104108      <HintPath>C:\Program Files\HeuristicLab 3.3\HeuristicLab.Optimization-3.3.dll</HintPath>
     109    </Reference>
     110    <Reference Include="HeuristicLab.Parameters-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=x86" />
     111    <Reference Include="HeuristicLab.Persistence-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=x86" />
     112    <Reference Include="HeuristicLab.PluginInfrastructure-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=x86" />
     113    <Reference Include="HeuristicLab.Random-3.3">
     114      <HintPath>..\..\..\..\..\..\..\..\..\Program Files\HeuristicLab 3.3\HeuristicLab.Random-3.3.dll</HintPath>
    105115    </Reference>
    106116    <Reference Include="Microsoft.VisualStudio.QualityTools.UnitTestFramework, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />
     
    109119      <RequiredTargetFramework>3.5</RequiredTargetFramework>
    110120    </Reference>
     121    <Reference Include="System.Data" />
     122    <Reference Include="System.Drawing" />
    111123  </ItemGroup>
    112124  <ItemGroup>
     
    117129  <ItemGroup>
    118130    <Compile Include="Properties\AssemblyInfo.cs" />
     131    <Compile Include="QAPMoveEvaluatorTest.cs" />
    119132    <None Include="Properties\AssemblyInfo.frame" />
    120133    <Compile Include="QAPLIBInstancesTest.cs" />
    121134  </ItemGroup>
    122135  <ItemGroup>
     136    <ProjectReference Include="..\..\..\HeuristicLab.Encodings.PermutationEncoding\3.3\HeuristicLab.Encodings.PermutationEncoding-3.3.csproj">
     137      <Project>{DBECB8B0-B166-4133-BAF1-ED67C3FD7FCA}</Project>
     138      <Name>HeuristicLab.Encodings.PermutationEncoding-3.3</Name>
     139    </ProjectReference>
    123140    <ProjectReference Include="..\HeuristicLab.Problems.QuadraticAssignment-3.3.csproj">
    124141      <Project>{79271BC8-4446-40E2-BB89-9BE4E17174FE}</Project>
  • branches/QAP/QAP.sln

    r5723 r5785  
    2222EndProject
    2323Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Analysis.Tests-3.3", "HeuristicLab.Analysis\3.3\Tests\HeuristicLab.Analysis.Tests\HeuristicLab.Analysis.Tests-3.3.csproj", "{34C967E5-EEB1-4502-8035-122EDDEF44CB}"
     24EndProject
     25Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Encodings.PermutationEncoding-3.3", "HeuristicLab.Encodings.PermutationEncoding\3.3\HeuristicLab.Encodings.PermutationEncoding-3.3.csproj", "{DBECB8B0-B166-4133-BAF1-ED67C3FD7FCA}"
     26EndProject
     27Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Encodings.PermutationEncoding.Views-3.3", "HeuristicLab.Encodings.PermutationEncoding.Views\3.3\HeuristicLab.Encodings.PermutationEncoding.Views-3.3.csproj", "{3EAF1454-086D-44A2-8509-B1BA24DB1865}"
     28EndProject
     29Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Encodings.PermutationEncoding-3.3.Tests", "HeuristicLab.Encodings.PermutationEncoding\3.3\Tests\HeuristicLab.Encodings.PermutationEncoding-3.3.Tests.csproj", "{13CA37D6-4111-4E7B-BE2E-AF3DE462D384}"
    2430EndProject
    2531Global
     
    120126    {34C967E5-EEB1-4502-8035-122EDDEF44CB}.Release|x86.ActiveCfg = Release|Any CPU
    121127    {34C967E5-EEB1-4502-8035-122EDDEF44CB}.Release|x86.Build.0 = Release|Any CPU
     128    {DBECB8B0-B166-4133-BAF1-ED67C3FD7FCA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
     129    {DBECB8B0-B166-4133-BAF1-ED67C3FD7FCA}.Debug|Any CPU.Build.0 = Debug|Any CPU
     130    {DBECB8B0-B166-4133-BAF1-ED67C3FD7FCA}.Debug|x64.ActiveCfg = Debug|x64
     131    {DBECB8B0-B166-4133-BAF1-ED67C3FD7FCA}.Debug|x64.Build.0 = Debug|x64
     132    {DBECB8B0-B166-4133-BAF1-ED67C3FD7FCA}.Debug|x86.ActiveCfg = Debug|x86
     133    {DBECB8B0-B166-4133-BAF1-ED67C3FD7FCA}.Debug|x86.Build.0 = Debug|x86
     134    {DBECB8B0-B166-4133-BAF1-ED67C3FD7FCA}.Release|Any CPU.ActiveCfg = Release|Any CPU
     135    {DBECB8B0-B166-4133-BAF1-ED67C3FD7FCA}.Release|Any CPU.Build.0 = Release|Any CPU
     136    {DBECB8B0-B166-4133-BAF1-ED67C3FD7FCA}.Release|x64.ActiveCfg = Release|x64
     137    {DBECB8B0-B166-4133-BAF1-ED67C3FD7FCA}.Release|x64.Build.0 = Release|x64
     138    {DBECB8B0-B166-4133-BAF1-ED67C3FD7FCA}.Release|x86.ActiveCfg = Release|x86
     139    {DBECB8B0-B166-4133-BAF1-ED67C3FD7FCA}.Release|x86.Build.0 = Release|x86
     140    {3EAF1454-086D-44A2-8509-B1BA24DB1865}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
     141    {3EAF1454-086D-44A2-8509-B1BA24DB1865}.Debug|Any CPU.Build.0 = Debug|Any CPU
     142    {3EAF1454-086D-44A2-8509-B1BA24DB1865}.Debug|x64.ActiveCfg = Debug|x64
     143    {3EAF1454-086D-44A2-8509-B1BA24DB1865}.Debug|x64.Build.0 = Debug|x64
     144    {3EAF1454-086D-44A2-8509-B1BA24DB1865}.Debug|x86.ActiveCfg = Debug|x86
     145    {3EAF1454-086D-44A2-8509-B1BA24DB1865}.Debug|x86.Build.0 = Debug|x86
     146    {3EAF1454-086D-44A2-8509-B1BA24DB1865}.Release|Any CPU.ActiveCfg = Release|Any CPU
     147    {3EAF1454-086D-44A2-8509-B1BA24DB1865}.Release|Any CPU.Build.0 = Release|Any CPU
     148    {3EAF1454-086D-44A2-8509-B1BA24DB1865}.Release|x64.ActiveCfg = Release|x64
     149    {3EAF1454-086D-44A2-8509-B1BA24DB1865}.Release|x64.Build.0 = Release|x64
     150    {3EAF1454-086D-44A2-8509-B1BA24DB1865}.Release|x86.ActiveCfg = Release|x86
     151    {3EAF1454-086D-44A2-8509-B1BA24DB1865}.Release|x86.Build.0 = Release|x86
     152    {13CA37D6-4111-4E7B-BE2E-AF3DE462D384}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
     153    {13CA37D6-4111-4E7B-BE2E-AF3DE462D384}.Debug|Any CPU.Build.0 = Debug|Any CPU
     154    {13CA37D6-4111-4E7B-BE2E-AF3DE462D384}.Debug|x64.ActiveCfg = Debug|x64
     155    {13CA37D6-4111-4E7B-BE2E-AF3DE462D384}.Debug|x64.Build.0 = Debug|x64
     156    {13CA37D6-4111-4E7B-BE2E-AF3DE462D384}.Debug|x86.ActiveCfg = Debug|x86
     157    {13CA37D6-4111-4E7B-BE2E-AF3DE462D384}.Debug|x86.Build.0 = Debug|x86
     158    {13CA37D6-4111-4E7B-BE2E-AF3DE462D384}.Release|Any CPU.ActiveCfg = Release|Any CPU
     159    {13CA37D6-4111-4E7B-BE2E-AF3DE462D384}.Release|Any CPU.Build.0 = Release|Any CPU
     160    {13CA37D6-4111-4E7B-BE2E-AF3DE462D384}.Release|x64.ActiveCfg = Release|x64
     161    {13CA37D6-4111-4E7B-BE2E-AF3DE462D384}.Release|x64.Build.0 = Release|x64
     162    {13CA37D6-4111-4E7B-BE2E-AF3DE462D384}.Release|x86.ActiveCfg = Release|x86
     163    {13CA37D6-4111-4E7B-BE2E-AF3DE462D384}.Release|x86.Build.0 = Release|x86
    122164  EndGlobalSection
    123165  GlobalSection(SolutionProperties) = preSolution
Note: See TracChangeset for help on using the changeset viewer.