Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
03/22/11 01:56:25 (14 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/HeuristicLab.Problems.QuadraticAssignment/3.3
Files:
5 added
3 edited

Legend:

Unmodified
Added
Removed

  • 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>
Note: See TracChangeset for help on using the changeset viewer.