Changeset 1218 for trunk/sources/HeuristicLab.BitVector

Timestamp:

02/16/09 01:21:53 (16 years ago)

Author:

swagner

Message:

Refactoring of crossover operators (#470)

Location:

trunk/sources/HeuristicLab.BitVector

Files:

• BitVectorCrossoverBase.cs (modified) (1 diff)
• SinglePointCrossover.cs (modified) (1 diff)

trunk/sources/HeuristicLab.BitVector/BitVectorCrossoverBase.cs

@@ -42 +42 @@
 
     /// <summary>
-    /// Performs a crossover of two given parents.
+    /// Performs a crossover by calling <see cref="Cross(HeuristicLab.Core.IScope, HeuristicLab.Core.IRandom, bool[][]"/>
+    /// and adds the created bit vector to the current scope.
     /// </summary>
-    /// <exception cref="InvalidOperationException">Thrown when the parents have different lengths.</exception>
-    /// <param name="scope">The current scope.</param>
+    /// <exception cref="InvalidOperationException">Thrown if the parents have different lengths.</exception>
+    /// <param name="scope">The current scope which represents a new child.</param>
     /// <param name="random">A random number generator.</param>
-    /// <param name="parent1">The first parent for crossover.</param>
-    /// <param name="parent2">The second parent for crossover.</param>
-    /// <param name="child">The resulting child scope.</param>
-    protected sealed override void Cross(IScope scope, IRandom random, IScope parent1, IScope parent2, IScope child) {
-      IVariableInfo bitVectorInfo = GetVariableInfo("BitVector");
-      BoolArrayData vector1 = parent1.GetVariableValue<BoolArrayData>(bitVectorInfo.FormalName, false);
-      BoolArrayData vector2 = parent2.GetVariableValue<BoolArrayData>(bitVectorInfo.FormalName, false);
+    protected sealed override void Cross(IScope scope, IRandom random) {
+      bool[][] parents = new bool[scope.SubScopes.Count][];
+      int length = -1;
+      for (int i = 0; i < scope.SubScopes.Count; i++) {
+        parents[i] = scope.SubScopes[i].GetVariableValue<BoolArrayData>("BitVector", false).Data;
+        if (i == 0) length = parents[i].Length;
+        else if (parents[i].Length != length) throw new InvalidOperationException("ERROR in BitVectorCrossoverBase: Cannot apply crossover to bit vectors of different length");
+      }
 
-      if (vector1.Data.Length != vector2.Data.Length) throw new InvalidOperationException("Cannot apply crossover to bit vectors of different length.");
-
-      bool[] result = Cross(scope, random, vector1.Data, vector2.Data);
-      child.AddVariable(new Variable(child.TranslateName(bitVectorInfo.FormalName), new BoolArrayData(result)));
+      bool[] result = Cross(scope, random, parents);
+      scope.AddVariable(new Variable(scope.TranslateName("BitVector"), new BoolArrayData(result)));
     }
 
     /// <summary>
-    /// Performs a crossover of two given parents.
+    /// Performs a crossover of multiple bit vectors.
     /// </summary>
     /// <param name="scope">The current scope.</param>
     /// <param name="random">A random number generator.</param>
-    /// <param name="parent1">The first parent for crossover.</param>
-    /// <param name="parent2">The second parent for crossover.</param>
+    /// <param name="parents">An array containing all parent bit vectors.</param>
     /// <returns>The newly created bit vector, resulting from the crossover operation.</returns>
-    protected abstract bool[] Cross(IScope scope, IRandom random, bool[] parent1, bool[] parent2);
+    protected abstract bool[] Cross(IScope scope, IRandom random, bool[][] parents);
   }
 }

trunk/sources/HeuristicLab.BitVector/SinglePointCrossover.cs

@@ -57 +57 @@
 
     /// <summary>
-    /// Performs a single point crossover at a randomly chosen position of the two 
+    /// Performs a single point crossover at a randomly chosen position of two 
     /// given parent bit vectors.
     /// </summary>
+    /// <exception cref="InvalidOperationException">Thrown if there are not exactly two parents.</exception>
     /// <param name="scope">The current scope.</param>
     /// <param name="random">A random number generator.</param>
-    /// <param name="parent1">The first parent for crossover.</param>
-    /// <param name="parent2">The second parent for crossover.</param>
+    /// <param name="parents">An array containing the two bit vectors that should be crossed.</param>
     /// <returns>The newly created bit vector, resulting from the single point crossover.</returns>
-    protected override bool[] Cross(IScope scope, IRandom random, bool[] parent1, bool[] parent2) {
-      return Apply(random, parent1, parent2);
+    protected override bool[] Cross(IScope scope, IRandom random, bool[][] parents) {
+      if (parents.Length != 2) throw new InvalidOperationException("ERROR in SinglePointCrossover: The number of parents is not equal to 2");
+      return Apply(random, parents[0], parents[1]);
     }
   }