Context Navigation

Changeset 6685 for branches/GeneralizedQAP/HeuristicLab.Encodings.PermutationEncoding/3.3

Timestamp:

08/31/11 11:52:11 (13 years ago)

Author:

abeham

Message:

#1628

Updated branch from trunk
Changed ReferenceEqualityComparer<T> to become a non-generic class (generic implementation probably was only made because of lacking support for co- and contravariance in C# 3.5)
Added finished experiment from sample algorithms to the tests
Wrote a unit test to instantiate every IDeepCloneable type, clone it and compare the objects in the object graph for equal references
Wrote a unit test to load the experiment, clone it and compare again the objects in the object graph
Preliminary fix for a potential bug in ThreadSafeLog
Preliminary fix for a potential bug in OperatorGraphVisualizationInfo
Preliminary fix for a potential bug in Calculator (and added license headers)
Preliminary fix for a potential bug in ScrambleMove

Location:

branches/GeneralizedQAP

Files:

branches/GeneralizedQAP
- Property svn:mergeinfo changed
  /trunk/sources (added) merged: 6648-6649,6652-6656,6661-6674,6676-6681,6684
branches/GeneralizedQAP/HeuristicLab.Encodings.PermutationEncoding
- Property svn:mergeinfo changed
  /trunk/sources/HeuristicLab.Encodings.PermutationEncoding (added) merged: 6648

-                      r6342
+                      r6685
     <Compile Include="Crossovers\UniformLikeCrossover.cs" />
     <Compile Include="HeuristicLabEncodingsPermutationEncodingPlugin.cs" />
+    <Compile Include="Interfaces\IPermutationScrambleMoveOperator.cs" />
     <Compile Include="Interfaces\IPermutationMultiNeighborhoodShakingOperator.cs" />
     <Compile Include="Interfaces\IPermutationSwap2MoveOperator.cs" />
 …
     <Compile Include="Moves\Edge.cs" />
     <Compile Include="Moves\PermutationMoveAttribute.cs" />
+    <Compile Include="Moves\Scramble\StochasticScrambleMultiMoveGenerator.cs" />
+    <Compile Include="Moves\Scramble\ScrambleMove.cs" />
+    <Compile Include="Moves\Scramble\ScrambleMoveGenerator.cs" />
+    <Compile Include="Moves\Scramble\ScrambleMoveMaker.cs" />
     <Compile Include="Moves\StandardEdgeEqualityComparer.cs" />
     <Compile Include="Moves\Swap2\ExhaustiveSwap2MoveGenerator.cs" />

-                      r5445
+                      r6685
     /// <param name="permutation">The permutation to manipulate.</param>
     public static void Apply(IRandom random, Permutation permutation) {
-      Permutation original = (Permutation)permutation.Clone();
       int breakPoint1, breakPoint2;
       int[] scrambledIndices, remainingIndices, temp;
       int selectedIndex, index;
       breakPoint1 = random.Next(original.Length - 1);
       breakPoint2 = random.Next(breakPoint1 + 1, original.Length);
+      breakPoint1 = random.Next(permutation.Length - 1);
+      breakPoint2 = random.Next(breakPoint1 + 1, permutation.Length);
       scrambledIndices = new int[breakPoint2 - breakPoint1 + 1];
 …
+      }
+      for (int i = 0; i <= (breakPoint2 - breakPoint1); i++) {  // scramble permutation between breakpoints
+        permutation[breakPoint1 + i] = original[breakPoint1 + scrambledIndices[i]];
+      Apply(permutation, breakPoint1, scrambledIndices);
+    }
+    public static void Apply(Permutation permutation, int startIndex, int[] scrambleArray) {
+      Permutation original = (Permutation)permutation.Clone();
+      for (int i = 0; i < scrambleArray.Length; i++) {  // scramble permutation between breakpoints
+        permutation[startIndex + i] = original[startIndex + scrambleArray[i]];
+      }
+    }

-                      r6684
+                      r6685
       : base(original, cloner) {
       this.StartIndex = original.StartIndex;
+      this.ScrambledIndices = (int[])original.ScrambledIndices.Clone();
+      if (original.ScrambledIndices != null)
+        this.ScrambledIndices = (int[])original.ScrambledIndices.Clone();
+    }
     public ScrambleMove() : this(-1, null) { }

Note: See TracChangeset for help on using the changeset viewer.