Changeset 1218 for trunk/sources/HeuristicLab.SimOpt

Timestamp:

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

Author:

swagner

Message:

Refactoring of crossover operators (#470)

Location:

trunk/sources/HeuristicLab.SimOpt

Files:

• SimOptDiscreteMultiCrossover.cs (modified) (3 diffs)
• SimOptSinglePointCrossover.cs (modified) (2 diffs)

trunk/sources/HeuristicLab.SimOpt/SimOptDiscreteMultiCrossover.cs

@@ -29 +29 @@
 
 namespace HeuristicLab.SimOpt {
-  public class SimOptDiscreteMultiCrossover : MultiCrossoverBase {
+  public class SimOptDiscreteMultiCrossover : CrossoverBase {
 
     public override string Description {
@@ -40 +40 @@
     }
 
-    protected override void Cross(IScope scope, IRandom random, IScope[] parents, IScope child) {
+    protected override void Cross(IScope scope, IRandom random) {
       ICollection<IConstraint> violated;
 
-      ConstrainedItemList[] p = new ConstrainedItemList[parents.Length];
+      ConstrainedItemList[] p = new ConstrainedItemList[scope.SubScopes.Count];
       for (int i = 0; i < p.Length; i++) {
-        p[i] = parents[i].GetVariableValue<ConstrainedItemList>("Item", false);
+        p[i] = scope.SubScopes[i].GetVariableValue<ConstrainedItemList>("Item", false);
         if (i > 0 && p[i].Count != p[i-1].Count) throw new InvalidOperationException("ERROR: the lists do not contain the same number of items");
       }
@@ -55 +55 @@
           childList.BeginCombinedOperation();
           for (int i = 0; i < childList.Count; i++) {
-            int nextParent = random.Next(0, parents.Length);
+            int nextParent = random.Next(0, scope.SubScopes.Count);
             if (nextParent > 0) childList.TrySetAt(i, (IItem)p[nextParent].Clone(), out violated);
           }
         } while (!childList.EndCombinedOperation(out violated) && ++iter < 100);
         if (violated.Count == 0) {
-          child.AddVariable(new Variable(parents[0].TranslateName("Item"), childList));
+          scope.AddVariable(new Variable(scope.SubScopes[0].TranslateName("Item"), childList));
         }
       }

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));
         }
       }