Changeset 2830 for trunk/sources/HeuristicLab.Permutation

Timestamp:

02/19/10 02:15:10 (15 years ago)

Author:

swagner

Message:

Operator architecture refactoring (#95)

• worked on operators and SGA
• improved performance

Location:

trunk/sources/HeuristicLab.Permutation/3.3

Files:

• CyclicCrossover.cs (modified) (2 diffs)
• InversionManipulator.cs (modified) (3 diffs)
• MaximalPreservativeCrossover.cs (modified) (2 diffs)
• OrderCrossover.cs (modified) (2 diffs)
• PartiallyMatchedCrossover.cs (modified) (2 diffs)
• Permutation.cs (modified) (1 diff)
• PermutationManipulator.cs (modified) (1 diff)

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

@@ -54 +54 @@
       if (parent1.Length != parent2.Length) throw new ArgumentException("CyclicCrossover: The parent permutations are of unequal length");
       int length = parent1.Length;
-      Permutation result = new Permutation(length);
+      int[] result = new int[length];
       bool[] indexCopied = new bool[length];
       int[] invParent1 = new int[length];
@@ -89 +89 @@
       } while (j < length);
 
-      return result;
+      return new Permutation(result);
     }
 

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

@@ -31 +31 @@
   [Creatable("Test")]
   public class InversionManipulator : PermutationManipulator {
-
     /// <summary>
     /// Inverts a randomly chosen part of a permutation.
@@ -38 +37 @@
     /// <param name="permutation">The permutation to manipulate.</param>
     /// <returns>The new manipulated permutation.</returns>
-    public static Permutation Apply(IRandom random, Permutation permutation) {
-      Permutation result = (Permutation)permutation.Clone();
+    public static void Apply(IRandom random, Permutation permutation) {
       int breakPoint1, breakPoint2;
 
-      breakPoint1 = random.Next(result.Length - 1);
+      breakPoint1 = random.Next(permutation.Length - 1);
       do {
-        breakPoint2 = random.Next(result.Length - 1);
+        breakPoint2 = random.Next(permutation.Length - 1);
       } while (breakPoint2 == breakPoint1);
       if (breakPoint2 < breakPoint1) { int h = breakPoint1; breakPoint1 = breakPoint2; breakPoint2 = h; }
 
-      for (int i = 0; i <= (breakPoint2 - breakPoint1); i++) {  // invert permutation between breakpoints
-        result[breakPoint1 + i] = permutation[breakPoint2 - i];
+      for (int i = 0; i <= (breakPoint2 - breakPoint1) / 2; i++) {  // invert permutation between breakpoints
+        int temp = permutation[breakPoint1 + i];
+        permutation[breakPoint1 + i] = permutation[breakPoint2 - i];
+        permutation[breakPoint2 - i] = temp;
       }
-      return result;
     }
 
@@ -60 +59 @@
     /// <param name="permutation">The permutation to manipulate.</param>
     /// <returns>The new manipulated permuation.</returns>
-    protected override Permutation Manipulate(IRandom random, Permutation permutation) {
-      return Apply(random, permutation);
+    protected override void Manipulate(IRandom random, Permutation permutation) {
+      Apply(random, permutation);
     }
   }

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

@@ -59 +59 @@
       if (parent1.Length < 4) throw new ArgumentException("MaximalPreservativeCrossover: The parent permutation must be at least of size 4");
       int length = parent1.Length;
-      Permutation result = new Permutation(length);
+      int[] result = new int[length];
       bool[] numberCopied = new bool[length];
       int breakPoint1, breakPoint2, subsegmentLength, index;
@@ -119 +119 @@
       } while (index != breakPoint1);
 
-      return result;
+      return new Permutation(result);
     }
 

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

@@ -45 +45 @@
     /// <returns>The new permutation resulting from the crossover.</returns>
     public static Permutation Apply(IRandom random, Permutation parent1, Permutation parent2) {
-      Permutation result = new Permutation(parent1.Length);
+      int[] result = new int[parent1.Length];
       bool[] copied = new bool[result.Length];
 
@@ -66 +66 @@
         }
       }
-      return result;
+      return new Permutation(result);
     }
 

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

@@ -57 +57 @@
       if (parent1.Length < 4) throw new ArgumentException("PartiallyMatchedCrossover: The parent permutation must be at least of size 4");
       int length = parent1.Length;
-      Permutation result = new Permutation(length); ;
+      int[] result = new int[length];
       int[] invResult = new int[length];
 
@@ -85 +85 @@
       }
 
-      return result;
+      return new Permutation(result);
     }
 

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

@@ -44 +44 @@
     public Permutation(int[] elements)
       : base(elements) {
-      if (!Validate()) throw new ArgumentException("Elements do not represent a valid permutation.");
     }
     private Permutation(Permutation elements) : base(elements) { }

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

@@ -46 +46 @@
 
     public sealed override IExecutionSequence Apply() {
-      PermutationParameter.ActualValue = Manipulate(RandomParameter.ActualValue, PermutationParameter.ActualValue);
+      Manipulate(RandomParameter.ActualValue, PermutationParameter.ActualValue);
       return base.Apply();
     }
 
-    protected abstract Permutation Manipulate(IRandom random, Permutation permutation);
+    protected abstract void Manipulate(IRandom random, Permutation permutation);
   }
 }