Changeset 73 for trunk/sources/HeuristicLab.RealVector/RandomConvexCrossover.cs

Timestamp:

03/18/08 00:40:57 (16 years ago)

Author:

swagner

Message:

Worked on ticket #15

• adapted interfaces of static Apply methods
• added missing variable info Maximization in HeuristicCrossover
• simplified code

File:

• trunk/sources/HeuristicLab.RealVector/RandomConvexCrossover.cs (modified) (1 diff)

trunk/sources/HeuristicLab.RealVector/RandomConvexCrossover.cs

@@ -11 +11 @@
     }
 
-    public static double[] Apply(IScope scope, IRandom random, double[] parent1, double[] parent2) {
-      double factor;
+    public static double[] Apply(IRandom random, double[] parent1, double[] parent2) {
       int length = parent1.Length;
       double[] result = new double[length];
-      double min = scope.GetVariableValue<DoubleData>("Minimum", true).Data;
-      double max = scope.GetVariableValue<DoubleData>("Maximum", true).Data;
+      double factor = random.NextDouble();
 
-      factor = random.NextDouble();
-
-      for (int i = 0; i < length; i++) {
+      for (int i = 0; i < length; i++)
         result[i] = (factor * parent1[i]) + ((1 - factor) * parent2[i]);
-
-        // check borders
-        if (result[i] < min) { result[i] = min; }
-        if (result[i] > max) { result[i] = max; }
-      }
-
       return result;
     }
 
     protected override double[] Cross(IScope scope, IRandom random, double[] parent1, double[] parent2) {
-      return Apply(scope, random, parent1, parent2);
+      return Apply(random, parent1, parent2);
     }
   }