Changeset 2997 for trunk/sources/HeuristicLab.Encodings.Permutation

Timestamp:

03/11/10 02:23:25 (14 years ago)

Author:

abeham

Message:

Updated tabu search and added an engine for the berlin52 TSP #840
Also added a BestQualityMemorizer operator in HeuristicLab.Analysis-3.3

Location:

trunk/sources/HeuristicLab.Encodings.Permutation/3.3

Files:

• HeuristicLab.Encodings.Permutation-3.3.csproj (modified) (2 diffs)
• Interfaces/IPermutationMoveGenerator.cs (added)
• Manipulators/InversionManipulator.cs (modified) (1 diff)
• Moves/ExhaustiveTwoOptMoveGenerator.cs (added)
• Moves/Permutation2IndexMove.cs (deleted)
• Moves/Permutation2OptExhaustiveMoveGenerator.cs (deleted)
• Moves/Permutation2OptMove.cs (deleted)
• Moves/TwoIndexMove.cs (added)
• Moves/TwoOptMove.cs (added)
• Moves/TwoOptMoveMaker.cs (added)
• Moves/TwoOptMoveTabuAttribute.cs (added)
• Moves/TwoOptMoveTabuEvaluator.cs (added)
• Moves/TwoOptMoveTabuMaker.cs (added)
• Permutation.cs (modified) (1 diff)

trunk/sources/HeuristicLab.Encodings.Permutation/3.3/HeuristicLab.Encodings.Permutation-3.3.csproj

@@ -96 +96 @@
     <Compile Include="Interfaces\IPermutationCrossover.cs" />
     <Compile Include="Interfaces\IPermutationManipulator.cs" />
+    <Compile Include="Interfaces\IPermutationMoveGenerator.cs" />
     <Compile Include="Interfaces\IPermutationOperator.cs" />
     <Compile Include="Manipulators\InsertionManipulator.cs" />
@@ -104 +105 @@
     <Compile Include="Manipulators\TranslocationInversionManipulator.cs" />
     <Compile Include="Manipulators\TranslocationManipulator.cs" />
-    <Compile Include="Moves\Permutation2IndexMove.cs" />
-    <Compile Include="Moves\Permutation2OptExhaustiveMoveGenerator.cs" />
-    <Compile Include="Moves\Permutation2OptMove.cs" />
+    <Compile Include="Moves\ExhaustiveTwoOptMoveGenerator.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Moves\TwoIndexMove.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Moves\TwoOptMove.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Moves\TwoOptMoveMaker.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Moves\TwoOptMoveTabuAttribute.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Moves\TwoOptMoveTabuEvaluator.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Moves\TwoOptMoveTabuMaker.cs">
+      <SubType>Code</SubType>
+    </Compile>
     <Compile Include="PermutationManipulator.cs" />
     <Compile Include="PermutationCrossover.cs" />

trunk/sources/HeuristicLab.Encodings.Permutation/3.3/Manipulators/InversionManipulator.cs

@@ -47 +47 @@
       } while (breakPoint2 == breakPoint1);
       if (breakPoint2 < breakPoint1) { int h = breakPoint1; breakPoint1 = breakPoint2; breakPoint2 = h; }
+      Apply(permutation, breakPoint1, breakPoint2);
+    }
 
+    public static void Apply(Permutation permutation, int breakPoint1, int breakPoint2) {
       for (int i = 0; i <= (breakPoint2 - breakPoint1) / 2; i++) {  // invert permutation between breakpoints
         int temp = permutation[breakPoint1 + i];

trunk/sources/HeuristicLab.Encodings.Permutation/3.3/Permutation.cs

@@ -85 +85 @@
     }
 
+    public int GetCircular(int position) {
+      if (position >= Length) position = position % Length;
+      while (position < 0) position += Length;
+      return this[position];
+    }
+
     #region IStringConvertibleArrayData Members
     int IStringConvertibleArrayData.Length {