Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
12/11/12 22:16:44 (12 years ago)
Author:
ascheibe
Message:

#1995 added a similarity calculator operator for QAP

Location:
trunk/sources/HeuristicLab.Problems.QuadraticAssignment/3.3
Files:
1 added
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/sources/HeuristicLab.Problems.QuadraticAssignment/3.3/HeuristicLab.Problems.QuadraticAssignment-3.3.csproj

    r8600 r9029  
    132132    <Compile Include="QAPPermutationProximityCalculator.cs" />
    133133    <Compile Include="QuadraticAssignmentProblem.cs" />
     134    <Compile Include="QAPSimilarityCalculator.cs" />
    134135    <None Include="Plugin.cs.frame" />
    135136    <Compile Include="Plugin.cs" />
     
    181182      <Private>False</Private>
    182183    </ProjectReference>
     184    <ProjectReference Include="..\..\HeuristicLab.Optimization.Operators\3.3\HeuristicLab.Optimization.Operators-3.3.csproj">
     185      <Project>{25087811-f74c-4128-bc86-8324271da13e}</Project>
     186      <Name>HeuristicLab.Optimization.Operators-3.3</Name>
     187      <Private>False</Private>
     188    </ProjectReference>
    183189    <ProjectReference Include="..\..\HeuristicLab.Optimization\3.3\HeuristicLab.Optimization-3.3.csproj">
    184190      <Project>{14AB8D24-25BC-400C-A846-4627AA945192}</Project>
     
    213219  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
    214220  <PropertyGroup>
    215    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">set Path=%25Path%25;$(ProjectDir);$(SolutionDir)
     221    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">set Path=%25Path%25;$(ProjectDir);$(SolutionDir)
    216222set ProjectDir=$(ProjectDir)
    217223set SolutionDir=$(SolutionDir)
     
    219225
    220226call PreBuildEvent.cmd</PreBuildEvent>
    221 <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
     227    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
    222228export ProjectDir=$(ProjectDir)
    223229export SolutionDir=$(SolutionDir)
  • trunk/sources/HeuristicLab.Problems.QuadraticAssignment/3.3/Plugin.cs.frame

    r8246 r9029  
    3434  [PluginDependency("HeuristicLab.Operators", "3.3")]
    3535  [PluginDependency("HeuristicLab.Optimization", "3.3")]
     36  [PluginDependency("HeuristicLab.Optimization.Operators", "3.3")]
    3637  [PluginDependency("HeuristicLab.Parameters", "3.3")]
    3738  [PluginDependency("HeuristicLab.Persistence", "3.3")]
  • trunk/sources/HeuristicLab.Problems.QuadraticAssignment/3.3/QuadraticAssignmentProblem.cs

    r8910 r9029  
    303303      Operators.Add(new QAPPopulationDiversityAnalyzer());
    304304      Operators.Add(new QAPExhaustiveSwap2LocalImprovement());
     305      Operators.Add(new QAPSimilarityCalculator());
    305306      ParameterizeAnalyzers();
    306307      ParameterizeOperators();
     
    386387        localOpt.WeightsParameter.ActualName = WeightsParameter.Name;
    387388      }
     389
     390      QAPSimilarityCalculator similarityCalculator = Operators.OfType<QAPSimilarityCalculator>().SingleOrDefault();
     391      if (similarityCalculator != null) {
     392        similarityCalculator.SolutionVariableName = SolutionCreator.PermutationParameter.ActualName;
     393        similarityCalculator.QualityVariableName = Evaluator.QualityParameter.ActualName;
     394      }
    388395    }
    389396
Note: See TracChangeset for help on using the changeset viewer.