Changeset 75

Timestamp:

03/18/08 12:15:06 (16 years ago)

Author:

swagner

Message:

Fixed ticket #65

• added operator BoundsChecker

Location:

trunk/sources/HeuristicLab.RealVector

Files:

• BoundsChecker.cs (copied) (copied from trunk/sources/HeuristicLab.RealVector/HeuristicCrossover.cs) (1 diff)
• HeuristicLab.RealVector.csproj (modified) (1 diff)

trunk/sources/HeuristicLab.RealVector/BoundsChecker.cs

@@ -4 +4 @@
 using HeuristicLab.Core;
 using HeuristicLab.Data;
-using HeuristicLab.Evolutionary;
 
 namespace HeuristicLab.RealVector {
-  class HeuristicCrossover : CrossoverBase {
-    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));
+  class BoundsChecker : OperatorBase {
+    public override string Description {
+      get { return "Checks if all elements of a real vector are inside a given minimum and maximum value. If not, elements are corrected."; }
     }
 
-    public override string Description {
-      get { return "Heuristic crossover for real vectors."; }
+    public BoundsChecker()
+      : base() {
+      AddVariableInfo(new VariableInfo("RealVector", "Real vector to check", typeof(DoubleArrayData), VariableKind.In | VariableKind.Out));
+      AddVariableInfo(new VariableInfo("Minimum", "Minimum value of each vector element (included).", typeof(DoubleData), VariableKind.In));
+      AddVariableInfo(new VariableInfo("Maximum", "Maximum value of each vector element (included).", typeof(DoubleData), VariableKind.In));
     }
 
-    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];
-      double factor = random.NextDouble();
+    public static double[] Apply(double min, double max, double[] vector) {
+      int length = vector.Length;
+      double[] result = (double[])vector.Clone();
 
       for (int i = 0; i < length; i++) {
-        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]);
+        if (result[i] < min) result[i] = min;
+        if (result[i] > max) result[i] = max;
       }
       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 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(random, maximization, vector1.Data, quality1.Data, vector2.Data, quality2.Data);
-      child.AddVariable(new Variable(realVectorInfo.ActualName, new DoubleArrayData(result)));
+    public override IOperation Apply(IScope scope) {
+      DoubleArrayData vector = GetVariableValue<DoubleArrayData>("RealVector", scope, false);
+      double min = GetVariableValue<DoubleData>("Minimum", scope, true).Data;
+      double max = GetVariableValue<DoubleData>("Maximum", scope, true).Data;
+      vector.Data = Apply(min, max, vector.Data);
+      return null;
     }
   }

trunk/sources/HeuristicLab.RealVector/HeuristicLab.RealVector.csproj

@@ -42 +42 @@
     <Compile Include="ContinuousCrossover.cs" />
     <Compile Include="CompleteContinuousCrossover.cs" />
+    <Compile Include="BoundsChecker.cs" />
     <Compile Include="DiscreteCrossover.cs" />
     <Compile Include="HeuristicCrossover.cs" />