Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
06/22/12 11:11:38 (13 years ago)
Author:
jkarder
Message:

#1331:

  • synced branch with trunk
  • added custom interface (ISimilarityBasedOperator) to mark operators that conduct similarity calculation
  • similarity calculators are now parameterized by the algorithm
  • deleted SolutionPool2TierUpdateMethod
  • deleted KnapsackMultipleGuidesPathRelinker
  • moved IImprovementOperator, IPathRelinker and ISimilarityCalculator to HeuristicLab.Optimization
  • added parameter descriptions
  • fixed plugin references
  • fixed count of EvaluatedSolutions
  • fixed check for duplicate solutions
  • minor code improvements
Location:
branches/ScatterSearch (trunk integration)
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • branches/ScatterSearch (trunk integration)

  • branches/ScatterSearch (trunk integration)/HeuristicLab.Encodings.IntegerVectorEncoding

    • Property svn:mergeinfo set to (toggle deleted branches)
      /trunk/sources/HeuristicLab.Encodings.IntegerVectorEncodingmergedeligible
      /branches/Benchmarking/sources/HeuristicLab.Encodings.IntegerVectorEncoding6917-7005
      /branches/CloningRefactoring/HeuristicLab.Encodings.IntegerVectorEncoding4656-4721
      /branches/DataAnalysis Refactoring/HeuristicLab.Encodings.IntegerVectorEncoding5471-5808
      /branches/DataAnalysis SolutionEnsembles/HeuristicLab.Encodings.IntegerVectorEncoding5815-6180
      /branches/DataAnalysis/HeuristicLab.Encodings.IntegerVectorEncoding4458-4459,​4462,​4464
      /branches/GP.Grammar.Editor/HeuristicLab.Encodings.IntegerVectorEncoding6284-6795
      /branches/GP.Symbols (TimeLag, Diff, Integral)/HeuristicLab.Encodings.IntegerVectorEncoding5060
      /branches/IntegerVectorEncoding/HeuristicLab.Encodings.IntegerVectorEncoding7681-8018
      /branches/NET40/sources/HeuristicLab.Encodings.IntegerVectorEncoding5138-5162
      /branches/ParallelEngine/HeuristicLab.Encodings.IntegerVectorEncoding5175-5192
      /branches/ProblemInstancesRegressionAndClassification/HeuristicLab.Encodings.IntegerVectorEncoding7568-7810
      /branches/QAPAlgorithms/HeuristicLab.Encodings.IntegerVectorEncoding6350-6627
      /branches/Restructure trunk solution/HeuristicLab.Encodings.IntegerVectorEncoding6828
      /branches/SuccessProgressAnalysis/HeuristicLab.Encodings.IntegerVectorEncoding5370-5682
      /branches/Trunk/HeuristicLab.Encodings.IntegerVectorEncoding6829-6865
      /branches/VNS/HeuristicLab.Encodings.IntegerVectorEncoding5594-5752
      /branches/histogram/HeuristicLab.Encodings.IntegerVectorEncoding5959-6341

  • branches/ScatterSearch (trunk integration)/HeuristicLab.Encodings.IntegerVectorEncoding/3.3/HeuristicLab.Encodings.IntegerVectorEncoding-3.3.csproj

    r6866 r8086  
    106106  </ItemGroup>
    107107  <ItemGroup>
     108    <Compile Include="BoundedIntegerVectorCrossover.cs" />
     109    <Compile Include="BoundedIntegerVectorManipulator.cs" />
    108110    <Compile Include="Creators\UniformRandomIntegerVectorCreator.cs" />
     111    <Compile Include="Crossovers\RoundedAverageCrossover.cs" />
    109112    <Compile Include="Crossovers\DiscreteCrossover.cs">
    110113      <SubType>Code</SubType>
    111114    </Compile>
    112115    <Compile Include="Crossovers\MultiIntegerVectorCrossover.cs" />
     116    <Compile Include="Crossovers\RoundedBlendAlphaBetaCrossover.cs" />
     117    <Compile Include="Crossovers\RoundedBlendAlphaCrossover.cs" />
     118    <Compile Include="Crossovers\RoundedHeuristicCrossover.cs" />
     119    <Compile Include="Crossovers\RoundedLocalCrossover.cs" />
    113120    <Compile Include="Crossovers\SinglePointCrossover.cs">
    114121      <SubType>Code</SubType>
    115122    </Compile>
     123    <Compile Include="Crossovers\RoundedUniformArithmeticCrossover.cs" />
     124    <Compile Include="Interfaces\IBoundedIntegerVectorOperator.cs" />
    116125    <Compile Include="Interfaces\IIntegerVectorCreator.cs" />
    117126    <Compile Include="Interfaces\IIntegerVectorCrossover.cs" />
    … …  
    121130    <Compile Include="IntegerVectorCrossover.cs" />
    122131    <Compile Include="IntegerVectorManipulator.cs" />
     132    <Compile Include="Interfaces\IIntegerVectorStdDevStrategyParameterCreator.cs" />
     133    <Compile Include="Interfaces\IIntegerVectorStdDevStrategyParameterCrossover.cs" />
     134    <Compile Include="Interfaces\IIntegerVectorStdDevStrategyParameterManipulator.cs" />
     135    <Compile Include="Interfaces\IIntegerVectorStdDevStrategyParameterOperator.cs" />
     136    <Compile Include="Manipulators\UniformSomePositionsManipulator.cs" />
     137    <Compile Include="Manipulators\RoundedNormalAllPositionsManipulator.cs" />
     138    <Compile Include="Manipulators\SelfAdaptiveRoundedNormalAllPositionsManipulator.cs" />
     139    <Compile Include="Manipulators\StdDevStrategyVectorCreator.cs" />
     140    <Compile Include="Manipulators\StdDevStrategyVectorCrossover.cs" />
     141    <Compile Include="Manipulators\StdDevStrategyVectorManipulator.cs" />
    123142    <Compile Include="Manipulators\UniformOnePositionManipulator.cs">
    124143      <SubType>Code</SubType>
    … …  
    129148    <Compile Include="IntegerVectorCreator.cs" />
    130149    <Compile Include="ShakingOperators\IntegerVectorShakingOperator.cs" />
    131   </ItemGroup>
    132   <ItemGroup>
    133     <ProjectReference Include="..\..\HeuristicLab.Collections\3.3\HeuristicLab.Collections-3.3.csproj">
    134       <Project>{958B43BC-CC5C-4FA2-8628-2B3B01D890B6}</Project>
    135       <Name>HeuristicLab.Collections-3.3</Name>
    136       <Private>False</Private>
    137     </ProjectReference>
    138     <ProjectReference Include="..\..\HeuristicLab.Common\3.3\HeuristicLab.Common-3.3.csproj">
    139       <Project>{A9AD58B9-3EF9-4CC1-97E5-8D909039FF5C}</Project>
    140       <Name>HeuristicLab.Common-3.3</Name>
    141       <Private>False</Private>
    142     </ProjectReference>
    143     <ProjectReference Include="..\..\HeuristicLab.Core\3.3\HeuristicLab.Core-3.3.csproj">
    144       <Project>{C36BD924-A541-4A00-AFA8-41701378DDC5}</Project>
    145       <Name>HeuristicLab.Core-3.3</Name>
    146       <Private>False</Private>
    147     </ProjectReference>
    148     <ProjectReference Include="..\..\HeuristicLab.Data\3.3\HeuristicLab.Data-3.3.csproj">
    149       <Project>{BBAB9DF5-5EF3-4BA8-ADE9-B36E82114937}</Project>
    150       <Name>HeuristicLab.Data-3.3</Name>
    151       <Private>False</Private>
    152     </ProjectReference>
    153     <ProjectReference Include="..\..\HeuristicLab.Operators\3.3\HeuristicLab.Operators-3.3.csproj">
    154       <Project>{23DA7FF4-D5B8-41B6-AA96-F0561D24F3EE}</Project>
    155       <Name>HeuristicLab.Operators-3.3</Name>
    156       <Private>False</Private>
    157     </ProjectReference>
    158     <ProjectReference Include="..\..\HeuristicLab.Optimization.Operators\3.3\HeuristicLab.Optimization.Operators-3.3.csproj">
    159       <Project>{25087811-F74C-4128-BC86-8324271DA13E}</Project>
    160       <Name>HeuristicLab.Optimization.Operators-3.3</Name>
    161       <Private>False</Private>
    162     </ProjectReference>
    163     <ProjectReference Include="..\..\HeuristicLab.Optimization\3.3\HeuristicLab.Optimization-3.3.csproj">
    164       <Project>{14AB8D24-25BC-400C-A846-4627AA945192}</Project>
    165       <Name>HeuristicLab.Optimization-3.3</Name>
    166       <Private>False</Private>
    167     </ProjectReference>
    168     <ProjectReference Include="..\..\HeuristicLab.Parameters\3.3\HeuristicLab.Parameters-3.3.csproj">
    169       <Project>{56F9106A-079F-4C61-92F6-86A84C2D84B7}</Project>
    170       <Name>HeuristicLab.Parameters-3.3</Name>
    171       <Private>False</Private>
    172     </ProjectReference>
    173     <ProjectReference Include="..\..\HeuristicLab.Persistence\3.3\HeuristicLab.Persistence-3.3.csproj">
    174       <Project>{102BC7D3-0EF9-439C-8F6D-96FF0FDB8E1B}</Project>
    175       <Name>HeuristicLab.Persistence-3.3</Name>
    176       <Private>False</Private>
    177     </ProjectReference>
    178     <ProjectReference Include="..\..\HeuristicLab.PluginInfrastructure\3.3\HeuristicLab.PluginInfrastructure-3.3.csproj">
    179       <Project>{94186A6A-5176-4402-AE83-886557B53CCA}</Project>
    180       <Name>HeuristicLab.PluginInfrastructure-3.3</Name>
    181       <Private>False</Private>
    182     </ProjectReference>
    183150  </ItemGroup>
    184151  <ItemGroup>
    … …  
    198165      <Install>true</Install>
    199166    </BootstrapperPackage>
     167  </ItemGroup>
     168  <ItemGroup>
     169    <ProjectReference Include="..\..\HeuristicLab.Collections\3.3\HeuristicLab.Collections-3.3.csproj">
     170      <Project>{958B43BC-CC5C-4FA2-8628-2B3B01D890B6}</Project>
     171      <Name>HeuristicLab.Collections-3.3</Name>
     172      <Private>False</Private>
     173    </ProjectReference>
     174    <ProjectReference Include="..\..\HeuristicLab.Common\3.3\HeuristicLab.Common-3.3.csproj">
     175      <Project>{A9AD58B9-3EF9-4CC1-97E5-8D909039FF5C}</Project>
     176      <Name>HeuristicLab.Common-3.3</Name>
     177      <Private>False</Private>
     178    </ProjectReference>
     179    <ProjectReference Include="..\..\HeuristicLab.Core\3.3\HeuristicLab.Core-3.3.csproj">
     180      <Project>{C36BD924-A541-4A00-AFA8-41701378DDC5}</Project>
     181      <Name>HeuristicLab.Core-3.3</Name>
     182      <Private>False</Private>
     183    </ProjectReference>
     184    <ProjectReference Include="..\..\HeuristicLab.Data\3.3\HeuristicLab.Data-3.3.csproj">
     185      <Project>{BBAB9DF5-5EF3-4BA8-ADE9-B36E82114937}</Project>
     186      <Name>HeuristicLab.Data-3.3</Name>
     187      <Private>False</Private>
     188    </ProjectReference>
     189    <ProjectReference Include="..\..\HeuristicLab.Operators\3.3\HeuristicLab.Operators-3.3.csproj">
     190      <Project>{23DA7FF4-D5B8-41B6-AA96-F0561D24F3EE}</Project>
     191      <Name>HeuristicLab.Operators-3.3</Name>
     192      <Private>False</Private>
     193    </ProjectReference>
     194    <ProjectReference Include="..\..\HeuristicLab.Optimization.Operators\3.3\HeuristicLab.Optimization.Operators-3.3.csproj">
     195      <Project>{25087811-F74C-4128-BC86-8324271DA13E}</Project>
     196      <Name>HeuristicLab.Optimization.Operators-3.3</Name>
     197      <Private>False</Private>
     198    </ProjectReference>
     199    <ProjectReference Include="..\..\HeuristicLab.Optimization\3.3\HeuristicLab.Optimization-3.3.csproj">
     200      <Project>{14AB8D24-25BC-400C-A846-4627AA945192}</Project>
     201      <Name>HeuristicLab.Optimization-3.3</Name>
     202      <Private>False</Private>
     203    </ProjectReference>
     204    <ProjectReference Include="..\..\HeuristicLab.Parameters\3.3\HeuristicLab.Parameters-3.3.csproj">
     205      <Project>{56F9106A-079F-4C61-92F6-86A84C2D84B7}</Project>
     206      <Name>HeuristicLab.Parameters-3.3</Name>
     207      <Private>False</Private>
     208    </ProjectReference>
     209    <ProjectReference Include="..\..\HeuristicLab.Persistence\3.3\HeuristicLab.Persistence-3.3.csproj">
     210      <Project>{102BC7D3-0EF9-439C-8F6D-96FF0FDB8E1B}</Project>
     211      <Name>HeuristicLab.Persistence-3.3</Name>
     212      <Private>False</Private>
     213    </ProjectReference>
     214    <ProjectReference Include="..\..\HeuristicLab.PluginInfrastructure\3.3\HeuristicLab.PluginInfrastructure-3.3.csproj">
     215      <Project>{94186A6A-5176-4402-AE83-886557B53CCA}</Project>
     216      <Name>HeuristicLab.PluginInfrastructure-3.3</Name>
     217      <Private>False</Private>
     218    </ProjectReference>
     219    <ProjectReference Include="..\..\HeuristicLab.Random\3.3\HeuristicLab.Random-3.3.csproj">
     220      <Project>{F4539FB6-4708-40C9-BE64-0A1390AEA197}</Project>
     221      <Name>HeuristicLab.Random-3.3</Name>
     222      <Private>False</Private>
     223    </ProjectReference>
    200224  </ItemGroup>
    201225  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
Note: See TracChangeset for help on using the changeset viewer.