Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
06/27/17 13:45:50 (7 years ago)
Author:
abeham
Message:

#2706:

  • Added or updated similarity calculators and population similarity analysis for several problems (BinPacking, LAP, Orienteering, Parameter optimization, PTSP, QAP, TF, TSP, VRP)
  • Made TSPSimilarityCalculator obsolete since it's essentially the same as the one in the permutation plugin
  • Made QAPPopulationDiversityAnalyzer obsolete as it is replaced by the newer PopulationSimilarityAnalyzer
  • Removed genotype specific similarity code in QAPPermutationProximityCalculator (again identical to the permutation plugin)
  • Changed QAPSimilarityCalculator to perform phenotype similarity instead of genotype similarity (has not been previously used)
Location:
trunk/sources/HeuristicLab.Problems.ParameterOptimization/3.3
Files:
3 edited

Legend:

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

    r11623 r15069  
    104104  </ItemGroup>
    105105  <ItemGroup>
     106    <ProjectReference Include="..\..\HeuristicLab.Analysis\3.3\HeuristicLab.Analysis-3.3.csproj">
     107      <Project>{887425B4-4348-49ED-A457-B7D2C26DDBF9}</Project>
     108      <Name>HeuristicLab.Analysis-3.3</Name>
     109      <Private>False</Private>
     110    </ProjectReference>
    106111    <ProjectReference Include="..\..\HeuristicLab.Collections\3.3\HeuristicLab.Collections-3.3.csproj">
    107112      <Project>{958b43bc-cc5c-4fa2-8628-2b3b01d890b6}</Project>
    108113      <Name>HeuristicLab.Collections-3.3</Name>
     114      <Private>False</Private>
    109115    </ProjectReference>
    110116    <ProjectReference Include="..\..\HeuristicLab.Common\3.3\HeuristicLab.Common-3.3.csproj">
     
    131137      <Project>{23da7ff4-d5b8-41b6-aa96-f0561d24f3ee}</Project>
    132138      <Name>HeuristicLab.Operators-3.3</Name>
     139      <Private>False</Private>
     140    </ProjectReference>
     141    <ProjectReference Include="..\..\HeuristicLab.Optimization.Operators\3.3\HeuristicLab.Optimization.Operators-3.3.csproj">
     142      <Project>{25087811-F74C-4128-BC86-8324271DA13E}</Project>
     143      <Name>HeuristicLab.Optimization.Operators-3.3</Name>
    133144      <Private>False</Private>
    134145    </ProjectReference>
  • trunk/sources/HeuristicLab.Problems.ParameterOptimization/3.3/ParameterOptimizationProblem.cs

    r14185 r15069  
    2222using System;
    2323using System.Linq;
     24using HeuristicLab.Analysis;
    2425using HeuristicLab.Common;
    2526using HeuristicLab.Core;
     
    2728using HeuristicLab.Encodings.RealVectorEncoding;
    2829using HeuristicLab.Optimization;
     30using HeuristicLab.Optimization.Operators;
    2931using HeuristicLab.Parameters;
    3032using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     
    113115      Operators.Add(new BestSolutionAnalyzer());
    114116      Operators.Add(new BestSolutionsAnalyzer());
     117
     118      Operators.Add(new HammingSimilarityCalculator());
     119      Operators.Add(new EuclideanSimilarityCalculator());
     120      Operators.Add(new QualitySimilarityCalculator());
     121      Operators.Add(new PopulationSimilarityAnalyzer(Operators.OfType<ISolutionSimilarityCalculator>()));
     122
    115123      UpdateParameters();
    116124      UpdateStrategyVectorBounds();
     
    147155      foreach (var op in Operators.OfType<IRealVectorManipulator>())
    148156        op.RealVectorParameter.ActualName = SolutionCreator.RealVectorParameter.ActualName;
     157
     158      foreach (var similarityCalculator in Operators.OfType<ISolutionSimilarityCalculator>()) {
     159        similarityCalculator.SolutionVariableName = SolutionCreator.RealVectorParameter.ActualName;
     160        similarityCalculator.QualityVariableName = Evaluator.QualityParameter.ActualName;
     161      }
    149162    }
    150163
  • trunk/sources/HeuristicLab.Problems.ParameterOptimization/3.3/Plugin.cs.frame

    r14195 r15069  
    2828  [Plugin("HeuristicLab.Problems.ParameterOptimization", "3.3.14.$WCREV$")]
    2929  [PluginFile("HeuristicLab.Problems.ParameterOptimization-3.3.dll", PluginFileType.Assembly)]
     30  [PluginDependency("HeuristicLab.Analysis", "3.3")]
    3031  [PluginDependency("HeuristicLab.Collections", "3.3")]
    3132  [PluginDependency("HeuristicLab.Common", "3.3")]
     
    3536  [PluginDependency("HeuristicLab.Operators", "3.3")]
    3637  [PluginDependency("HeuristicLab.Optimization", "3.3")]
     38  [PluginDependency("HeuristicLab.Optimization.Operators", "3.3")]
    3739  [PluginDependency("HeuristicLab.Parameters", "3.3")]
    3840  [PluginDependency("HeuristicLab.Persistence", "3.3")]
Note: See TracChangeset for help on using the changeset viewer.