Changeset 1218 for trunk/sources/HeuristicLab.SimOpt/SimOptSinglePointCrossover.cs

Timestamp:

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

Author:

swagner

Message:

Refactoring of crossover operators (#470)

File:

• trunk/sources/HeuristicLab.SimOpt/SimOptSinglePointCrossover.cs (modified) (2 diffs)

trunk/sources/HeuristicLab.SimOpt/SimOptSinglePointCrossover.cs

@@ -40 +40 @@
     }
 
-    protected override void Cross(IScope scope, IRandom random, IScope parent1, IScope parent2, IScope child) {
+    protected override void Cross(IScope scope, IRandom random) {
       ICollection<IConstraint> violated;
-      ConstrainedItemList p1 = parent1.GetVariableValue<ConstrainedItemList>("Item", false);
-      ConstrainedItemList p2 = parent2.GetVariableValue<ConstrainedItemList>("Item", false);
+      ConstrainedItemList p1 = scope.SubScopes[0].GetVariableValue<ConstrainedItemList>("Item", false);
+      ConstrainedItemList p2 = scope.SubScopes[1].GetVariableValue<ConstrainedItemList>("Item", false);
 
       if (p1.Count != p2.Count) throw new InvalidOperationException("ERROR: the lists do not contain the same number of items");
@@ -58 +58 @@
         } while (!childList.EndCombinedOperation(out violated) && ++iter < 100);
         if (violated.Count == 0) {
-          child.AddVariable(new Variable(parent1.TranslateName("Item"), childList));
+          scope.AddVariable(new Variable(scope.SubScopes[0].TranslateName("Item"), childList));
         }
       }