Changeset 73

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

Location:

trunk/sources/HeuristicLab.RealVector

Files:

• AverageCrossover.cs (modified) (2 diffs)
• CompleteAverageCrossover.cs (modified) (1 diff)
• DiscreteCrossover.cs (modified) (1 diff)
• HeuristicCrossover.cs (modified) (2 diffs)
• RandomConvexCrossover.cs (modified) (1 diff)
• RandomLocalCrossover.cs (modified) (1 diff)

trunk/sources/HeuristicLab.RealVector/AverageCrossover.cs

@@ -11 +11 @@
     }
 
-    public static double[] Apply(IScope scope, IRandom random, double[] parent1, double[] parent2) {
+    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;
 
       for (int i = 0; i < length; i++) {
@@ -23 +21 @@
           result[i] = parent1[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);
     }
   }

trunk/sources/HeuristicLab.RealVector/CompleteAverageCrossover.cs

@@ -11 +11 @@
     }
 
-    public static double[] Apply(IScope scope, IRandom random, double[] parent1, double[] parent2) {
+    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;
 
-      for (int i = 0; i < length; i++) {
+      for (int i = 0; i < length; i++)
         result[i] = (parent1[i] + parent2[i]) / 2;
-
-        // 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);
     }
   }

trunk/sources/HeuristicLab.RealVector/DiscreteCrossover.cs

@@ -15 +15 @@
 
       for (int i = 0; i < length; i++) {
-        if (random.NextDouble() < 0.5) {
+        if (random.NextDouble() < 0.5)
           result[i] = parent1[i];
-        } else {
+        else
           result[i] = parent2[i];
-        }
       }
-
       return result;
     }

trunk/sources/HeuristicLab.RealVector/HeuristicCrossover.cs

@@ -10 +10 @@
     public HeuristicCrossover()
       : base() {
+      AddVariableInfo(new VariableInfo("Maximization", "Maximization problem", typeof(BoolData), VariableKind.In));
       AddVariableInfo(new VariableInfo("Quality", "Quality value", typeof(DoubleData), VariableKind.In));
       AddVariableInfo(new VariableInfo("RealVector", "Parent and child real vector", typeof(DoubleArrayData), VariableKind.In | VariableKind.New));
@@ -18 +19 @@
     }
 
-    public static double[] Apply(IScope scope, IRandom random, double[] parent1, double[] parent2, double quality1, double quality2) {
-      double factor;
+    public static double[] Apply(IRandom random, bool maximization, double[] parent1, double quality1, double[] parent2, double quality2) {
       int length = parent1.Length;
       double[] result = new double[length];
-      bool isMaximization = scope.GetVariableValue<BoolData>("Maximization", true).Data;
-      double min = scope.GetVariableValue<DoubleData>("Minimum", true).Data;
-      double max = scope.GetVariableValue<DoubleData>("Maximum", true).Data;
-
-      factor = random.NextDouble();
+      double factor = random.NextDouble();
 
       for (int i = 0; i < length; i++) {
-        if (isMaximization) {
-          // maximization problem
-          if (quality1 > quality2) {
-            result[i] = parent1[i] + factor * (parent1[i] - parent2[i]);
-          } else {
-            result[i] = parent2[i] + factor * (parent2[i] - parent1[i]);
-          } // if
-        } else {
-          // minimization problem
-          if (quality1 < quality2) {
-            result[i] = parent1[i] + factor * (parent1[i] - parent2[i]);
-          } else {
-            result[i] = parent2[i] + factor * (parent2[i] - parent1[i]);
-          } // if
-        } // if
-
-        // check borders
-        if (result[i] < min) { result[i] = min; }
-        if (result[i] > max) { result[i] = max; }
-      } // for
-
+        if ((maximization && (quality1 > quality2)) || ((!maximization) && (quality1 < quality2)))
+          result[i] = parent1[i] + factor * (parent1[i] - parent2[i]);
+        else
+          result[i] = parent2[i] + factor * (parent2[i] - parent1[i]);
+      }
       return result;
     }
 
     protected sealed override void Cross(IScope scope, IRandom random, IScope parent1, IScope parent2, IScope child) {
+      bool maximization = GetVariableValue<BoolData>("Maximization", scope, true).Data;
       IVariableInfo realVectorInfo = GetVariableInfo("RealVector");
       IVariableInfo qualityInfo = GetVariableInfo("Quality");
       DoubleArrayData vector1 = parent1.GetVariableValue<DoubleArrayData>(realVectorInfo.ActualName, false);
+      DoubleData quality1 = parent1.GetVariableValue<DoubleData>(qualityInfo.ActualName, false);
       DoubleArrayData vector2 = parent2.GetVariableValue<DoubleArrayData>(realVectorInfo.ActualName, false);
-      DoubleData quality1 = parent1.GetVariableValue<DoubleData>(qualityInfo.ActualName, false);
       DoubleData quality2 = parent2.GetVariableValue<DoubleData>(qualityInfo.ActualName, false);
 
       if (vector1.Data.Length != vector2.Data.Length) throw new InvalidOperationException("Cannot apply crossover to real vectors of different length.");
 
-      double[] result = Apply(scope, random, vector1.Data, vector2.Data, quality1.Data, quality2.Data);
+      double[] result = Apply(random, maximization, vector1.Data, quality1.Data, vector2.Data, quality2.Data);
       child.AddVariable(new Variable(realVectorInfo.ActualName, new DoubleArrayData(result)));
     }

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

trunk/sources/HeuristicLab.RealVector/RandomLocalCrossover.cs

@@ -11 +11 @@
     }
 
-    public static double[] Apply(IScope scope, IRandom random, double[] parent1, double[] parent2) {
+    public static double[] Apply(IRandom random, double[] parent1, double[] parent2) {
       double factor;
       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;
 
       for (int i = 0; i < length; i++) {
         factor = random.NextDouble();
         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);
     }
   }