Changeset 15079


Ignore:
Timestamp:
06/28/17 16:49:13 (4 months ago)
Author:
abeham
Message:

#2666: Added move generators for extract, merge, shift, and split moves and renamed those to EMSS moves, some code cleanup

Location:
trunk/sources
Files:
12 added
6 deleted
4 edited

Legend:

Unmodified
Added
Removed
  • trunk/sources/HeuristicLab.Encodings.LinearLinkageEncoding/3.4/HeuristicLab.Encodings.LinearLinkageEncoding-3.4.csproj

    r14663 r15079  
    165165    <Compile Include="Crossovers\SinglePointCrossover.cs" />
    166166    <Compile Include="Interfaces\ILinearLinkageMoveOperator.cs" />
     167    <Compile Include="Interfaces\ILinearLinkageEMSSMoveOperator.cs" />
    167168    <Compile Include="Interfaces\ILinearLinkageSwap2MoveOperator.cs" />
    168169    <Compile Include="Interfaces\ILinearLinkageCreator.cs" />
     
    177178    <Compile Include="Manipulators\MergeGroupManipulator.cs" />
    178179    <Compile Include="Manipulators\MultiLLEManipulator.cs" />
    179     <Compile Include="Moves\ExtractMove.cs" />
    180     <Compile Include="Moves\MergeMove.cs" />
    181     <Compile Include="Moves\Move.cs" />
    182     <Compile Include="Moves\ShiftMove.cs" />
    183     <Compile Include="Moves\SplitMove.cs" />
    184     <Compile Include="Moves\StaticAPI\MoveGenerator.cs" />
     180    <Compile Include="Moves\EMSS\EMSSMoveMaker.cs" />
     181    <Compile Include="Moves\EMSS\ExtractMove.cs" />
     182    <Compile Include="Moves\EMSS\MergeMove.cs" />
     183    <Compile Include="Moves\EMSS\EMSSMove.cs" />
     184    <Compile Include="Moves\EMSS\ExhaustiveEMSSMoveGenerator.cs" />
     185    <Compile Include="Moves\EMSS\EMSSMoveGenerator.cs" />
     186    <Compile Include="Moves\EMSS\StochasticEMSSMultiMoveGenerator.cs" />
     187    <Compile Include="Moves\EMSS\StochasticEMSSSingleMoveGenerator.cs" />
     188    <Compile Include="Moves\EMSS\ShiftMove.cs" />
     189    <Compile Include="Moves\EMSS\SplitMove.cs" />
    185190    <Compile Include="Moves\Swap\ExhaustiveSwap2MoveGenerator.cs" />
    186191    <Compile Include="Moves\Swap\StochasticSwap2MultiMoveGenerator.cs" />
  • trunk/sources/HeuristicLab.Encodings.LinearLinkageEncoding/3.4/Moves/Swap/ExhaustiveSwap2MoveGenerator.cs

    r14185 r15079  
    2929
    3030namespace HeuristicLab.Encodings.LinearLinkageEncoding {
    31   [Item("ExhaustiveSwap2MoveGenerator", "Generates all possible swap-2 moves from a given permutation.")]
     31  [Item("ExhaustiveSwap2MoveGenerator", "Generates all possible swap-2 moves from a given lle grouping.")]
    3232  [StorableClass]
    3333  public class ExhaustiveSwap2MoveGenerator : Swap2MoveGenerator, IExhaustiveMoveGenerator {
  • trunk/sources/HeuristicLab.Encodings.LinearLinkageEncoding/3.4/Moves/Swap/StochasticSwap2SingleMoveGenerator.cs

    r14185 r15079  
    2929
    3030namespace HeuristicLab.Encodings.LinearLinkageEncoding {
    31   [Item("StochasticSwap2SingleMoveGenerator", "Randomly samples a single from all possible swap-2 moves from a given grouping.")]
     31  [Item("StochasticSwap2SingleMoveGenerator", "Randomly samples a single from all possible swap-2 moves from a given lle grouping.")]
    3232  [StorableClass]
    3333  public class StochasticSwap2SingleMoveGenerator : Swap2MoveGenerator, IStochasticOperator, ISingleMoveGenerator {
  • trunk/sources/HeuristicLab.Tests/HeuristicLab.Encodings.LinearLinkageEncoding-3.4/MoveTests.cs

    r14663 r15079  
    3939        var beforeb = before.ToBackLinks();
    4040        var moves = 0;
    41         foreach (var move in MoveGenerator.Generate(lle)) {
     41        foreach (var move in ExhaustiveEMSSMoveGenerator.Generate(lle)) {
    4242          var lleb = lle.ToBackLinks();
    4343          move.Apply(lle);
     
    6666        var moves = 0;
    6767        for (var i = 1; i < lle.Length; i++) {
    68           var move = MoveGenerator.GenerateForItem(i, groupItems, lle, lleb).SampleRandom(random);
     68          var move = ExhaustiveEMSSMoveGenerator.GenerateForItem(i, groupItems, lle, lleb).SampleRandom(random);
    6969          move.Apply(lle);
    7070          move.ApplyToLLEb(lleb);
Note: See TracChangeset for help on using the changeset viewer.