Changeset 7775 for branches/ScatterSearch/HeuristicLab.Algorithms.ScatterSearch/3.3/Knapsack/NChildCrossover.cs

Timestamp:

05/02/12 19:09:48 (13 years ago)

Author:

jkarder

Message:

#1331:

• added operators for TestFunctions problems
• added more path relinking operators for the TravelingSalesman and the Knapsack problem
• added 2-tier version of the SolutionPoolUpdateMethod
• added parameters and adjusted types
• added some exception handling
• adjusted event handling
• updated plugin dependencies
• minor code improvements

File:

• branches/ScatterSearch/HeuristicLab.Algorithms.ScatterSearch/3.3/Knapsack/NChildCrossover.cs (modified) (3 diffs)

branches/ScatterSearch/HeuristicLab.Algorithms.ScatterSearch/3.3/Knapsack/NChildCrossover.cs

@@ -58 +58 @@
       if (parent1.Length != parent2.Length)
         throw new ArgumentException("NChildCrossover: The parents are of different length.");
-
       if (n.Value > Math.Pow(2, parent1.Length) - 2)
         throw new ArgumentException("NChildCrossover: There cannot be more children than 2^size of parents - 2.");
-
       if (n.Value < 1)
         throw new ArgumentException("NChildCrossover: N cannot be < 1.");
@@ -68 +66 @@
       for (int i = 0; i < n.Value; i++) {
         var solution = new BinaryVector(parent1.Length);
-        for (int j = 0; j < solution.Length; j++) {
+        for (int j = 0; j < solution.Length; j++)
           solution[j] = random.Next(2) % 2 == 0 ? parent1[j] : parent2[j];
-        }
         solutions[i] = solution;
       }
@@ -78 +75 @@
 
     protected override ItemArray<BinaryVector> Cross(IRandom random, ItemArray<BinaryVector> parents) {
-      if (parents.Length != 2) throw new ArgumentException("NChildCrossover: The number of parents is not equal to 2.");
-
-      if (NParameter.ActualValue == null) throw new InvalidOperationException("NChildCrossover: Parameter " + NParameter.ActualName + " could not be found.");
-
+      if (parents.Length != 2)
+        throw new ArgumentException("NChildCrossover: The number of parents is not equal to 2.");
+      if (NParameter.ActualValue == null)
+        throw new InvalidOperationException("NChildCrossover: Parameter " + NParameter.ActualName + " could not be found.");
       return Apply(random, parents[0], parents[1], NParameter.Value);
     }