Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
04/02/11 23:13:33 (14 years ago)
Author:
abeham
Message:

#1330

  • Merged QAP from branch into trunk
  • Merged MDS from branch into trunk
  • Merged Swap2 moves from branch into trunk
Location:
trunk/sources/HeuristicLab.Encodings.PermutationEncoding
Files:
1 added
5 edited
14 copied

Legend:

Unmodified
Added
Removed

  • trunk/sources/HeuristicLab.Encodings.PermutationEncoding

  • trunk/sources/HeuristicLab.Encodings.PermutationEncoding/3.3/HeuristicLab.Encodings.PermutationEncoding-3.3.csproj

    r5163 r5933  
    118118    <Compile Include="Crossovers\PositionBasedCrossover.cs" />
    119119    <Compile Include="HeuristicLabEncodingsPermutationEncodingPlugin.cs" />
     120    <Compile Include="Interfaces\IPermutationSwap2MoveOperator.cs" />
    120121    <Compile Include="Interfaces\IPermutationCreator.cs" />
    121122    <Compile Include="Interfaces\IPermutationCrossover.cs" />
    … …  
    133134    <Compile Include="Manipulators\TranslocationInversionManipulator.cs" />
    134135    <Compile Include="Manipulators\TranslocationManipulator.cs" />
     136    <Compile Include="Moves\Edge.cs" />
    135137    <Compile Include="Moves\PermutationMoveAttribute.cs" />
     138    <Compile Include="Moves\StandardEdgeEqualityComparer.cs" />
     139    <Compile Include="Moves\Swap2\ExhaustiveSwap2MoveGenerator.cs" />
     140    <Compile Include="Moves\Swap2\StochasticSwap2MultiMoveGenerator.cs" />
     141    <Compile Include="Moves\Swap2\StochasticSwap2SingleMoveGenerator.cs" />
     142    <Compile Include="Moves\Swap2\Swap2Move.cs" />
     143    <Compile Include="Moves\Swap2\Swap2MoveAbsoluteAttribute.cs" />
     144    <Compile Include="Moves\Swap2\Swap2MoveGenerator.cs" />
     145    <Compile Include="Moves\Swap2\Swap2MoveHardTabuCriterion.cs" />
     146    <Compile Include="Moves\Swap2\Swap2MoveMaker.cs" />
     147    <Compile Include="Moves\Swap2\Swap2MoveRelativeAttribute.cs" />
     148    <Compile Include="Moves\Swap2\Swap2MoveSoftTabuCriterion.cs" />
     149    <Compile Include="Moves\Swap2\Swap2MoveTabuMaker.cs" />
    136150    <Compile Include="Moves\ThreeIndexMove.cs" />
    137151    <Compile Include="Moves\ThreeOpt\StochasticSingleInsertionMoveGenerator.cs" />

  • trunk/sources/HeuristicLab.Encodings.PermutationEncoding/3.3/Manipulators/Swap2Manipulator.cs

    r5445 r5933  
    4949    /// <param name="permutation">The permutation to manipulate.</param>
    5050    public static void Apply(IRandom random, Permutation permutation) {
    51       int index1, index2, temp;
     51      int index1, index2;
    5252
    5353      index1 = random.Next(permutation.Length);
    5454      index2 = random.Next(permutation.Length);
    5555
    56       temp = permutation[index1];
     56      Apply(permutation, index1, index2);
     57    }
     58
     59    public static void Apply(Permutation permutation, int index1, int index2) {
     60      int temp = permutation[index1];
    5761      permutation[index1] = permutation[index2];
    5862      permutation[index2] = temp;

  • trunk/sources/HeuristicLab.Encodings.PermutationEncoding/3.3/Moves/ThreeIndexMove.cs

    r5445 r5933  
    2525
    2626namespace HeuristicLab.Encodings.PermutationEncoding {
    27   [Item("ThreeIndexMove", "A move on a permutation that is specified by 3 indices")]
     27  [Item("ThreeIndexMove", "A move on a permutation that is specified by 3 indices.")]
    2828  [StorableClass]
    2929  public class ThreeIndexMove : Item {

  • trunk/sources/HeuristicLab.Encodings.PermutationEncoding/3.3/Moves/TwoIndexMove.cs

    r5445 r5933  
    2525
    2626namespace HeuristicLab.Encodings.PermutationEncoding {
    27   [Item("TwoIndexMove", "A move on a permutation that is specified by 2 indices")]
     27  [Item("TwoIndexMove", "A move on a permutation that is specified by 2 indices.")]
    2828  [StorableClass]
    2929  public class TwoIndexMove : Item {
Note: See TracChangeset for help on using the changeset viewer.