Changeset 7681 for branches/IntegerVectorEncoding/HeuristicLab.Encodings.IntegerVectorEncoding

Timestamp:

04/02/12 00:29:39 (13 years ago)

Author:

abeham

Message:

#1775: added branch of plugin and new operators

Location:

branches/IntegerVectorEncoding/HeuristicLab.Encodings.IntegerVectorEncoding

Files:

• . (copied) (copied from trunk/sources/HeuristicLab.Encodings.IntegerVectorEncoding)
• 3.3/Creators/UniformRandomIntegerVectorCreator.cs (modified) (2 diffs)
• 3.3/Crossovers/AverageCrossover.cs (added)
• 3.3/Crossovers/MultiIntegerVectorCrossover.cs (modified) (1 diff)
• 3.3/Crossovers/SinglePointCrossover.cs (modified) (1 diff)
• 3.3/Crossovers/UniformAllPositionsArithmeticCrossover.cs (added)
• 3.3/Crossovers/UniformSomePositionsArithmeticCrossover.cs (added)
• 3.3/IntegerVector.cs (modified) (2 diffs)
• 3.3/IntegerVectorCreator.cs (modified) (2 diffs)
• 3.3/Interfaces/IBoundedIntegerVectorOperator.cs (added)
• 3.3/Interfaces/IIntegerVectorCreator.cs (modified) (1 diff)

branches/IntegerVectorEncoding/HeuristicLab.Encodings.IntegerVectorEncoding/3.3/Creators/UniformRandomIntegerVectorCreator.cs

@@ -49 +49 @@
     /// <param name="max">The maximum value of the sampling range for each vector element (exclusive).</param>
     /// <returns>The newly created integer vector.</returns>
-    public static IntegerVector Apply(IRandom random, int length, int min, int max) {
-      int[] result = new int[length];
-      for (int i = 0; i < length; i++)
-        result[i] = random.Next(min, max);
-      return new IntegerVector(result);
+    public static IntegerVector Apply(IRandom random, int length, IntMatrix bounds) {
+      var result = new IntegerVector(length);
+      result.Randomize(random, bounds);
+      return result;
     }
 
@@ -61 +60 @@
     /// <param name="random">The pseudo random number generator to use.</param>
     /// <param name="length">The length of the int vector.</param>
-    /// <param name="minimum">The minimum value of the sampling range for each vector element (inclusive).</param>
-    /// <param name="maximum">The maximum value of the sampling range for each vector element (exclusive).</param>
+    /// <param name="bounds">Contains in each row for each dimension minimum (inclusive), maximum (inclusive), and step size.</param>
     /// <returns>The newly created int vector.</returns>
-    protected override IntegerVector Create(IRandom random, IntValue length, IntValue minimum, IntValue maximum) {
-      return Apply(random, length.Value, minimum.Value, maximum.Value);
+    protected override IntegerVector Create(IRandom random, IntValue length, IntMatrix bounds) {
+      return Apply(random, length.Value, bounds);
     }
   }

branches/IntegerVectorEncoding/HeuristicLab.Encodings.IntegerVectorEncoding/3.3/Crossovers/MultiIntegerVectorCrossover.cs

@@ -34 +34 @@
   [Item("MultiIntegerVectorCrossover", "Randomly selects and applies one of its crossovers every time it is called.")]
   [StorableClass]
-  public class MultiIntegerVectorCrossover : StochasticMultiBranch<IIntegerVectorCrossover>, IIntegerVectorCrossover, IStochasticOperator {
+  public class MultiIntegerVectorCrossover : StochasticMultiBranch<IIntegerVectorCrossover>, IIntegerVectorCrossover, IStochasticOperator, IBoundedIntegerVectorOperator {
     public override bool CanChangeName {
       get { return false; }

branches/IntegerVectorEncoding/HeuristicLab.Encodings.IntegerVectorEncoding/3.3/Crossovers/SinglePointCrossover.cs

@@ -54 +54 @@
     public static IntegerVector Apply(IRandom random, IntegerVector parent1, IntegerVector parent2) {
       if (parent1.Length != parent2.Length)
-        throw new ArgumentException("DiscreteCrossover: The parents are of different length.");
+        throw new ArgumentException("SinglePointCrossover: The parents are of different length.");
 
       int length = parent1.Length;

branches/IntegerVectorEncoding/HeuristicLab.Encodings.IntegerVectorEncoding/3.3/IntegerVector.cs

@@ -20 +20 @@
 #endregion
 
+using System;
 using HeuristicLab.Common;
 using HeuristicLab.Core;
@@ -49 +50 @@
     }
 
-    public virtual void Randomize(IRandom random, int startIndex, int length, int min, int max) {
+    public virtual void Randomize(IRandom random, int startIndex, int length, int min, int max, int step = 1) {
       if (length > 0) {
-        for (int i = 0; i < length; i++)
-          array[startIndex + i] = random.Next(min, max);
+        int numbers = (int)Math.Floor((max - min) / (double)step);
+        for (int i = startIndex; i < startIndex + length; i++) {
+          array[i] = random.Next(numbers) * step + min;
+        }
         OnReset();
       }
     }
-    public void Randomize(IRandom random, int min, int max) {
-      Randomize(random, 0, Length, min, max);
+    public virtual void Randomize(IRandom random, int startIndex, int length, IntMatrix bounds) {
+      if (length > 0) {
+        for (int i = startIndex; i < startIndex + length; i++) {
+          int min = bounds[i % bounds.Rows, 0], max = bounds[i % bounds.Rows, 1], step = 1;
+          if (bounds.Columns > 2) step = bounds[i % bounds.Rows, 2];
+          int numbers = (int)Math.Floor((max - min) / (double)step);
+          array[i] = random.Next(numbers) * step + min;
+        }
+        OnReset();
+      }
+    }
+    public void Randomize(IRandom random, int min, int max, int step = 1) {
+      Randomize(random, 0, Length, min, max, step);
+    }
+    public void Randomize(IRandom random, IntMatrix bounds) {
+      Randomize(random, 0, Length, bounds);
     }
   }

branches/IntegerVectorEncoding/HeuristicLab.Encodings.IntegerVectorEncoding/3.3/IntegerVectorCreator.cs

@@ -47 +47 @@
       get { return (IValueLookupParameter<IntValue>)Parameters["Length"]; }
     }
-    public IValueLookupParameter<IntValue> MinimumParameter {
-      get { return (IValueLookupParameter<IntValue>)Parameters["Minimum"]; }
-    }
-    public IValueLookupParameter<IntValue> MaximumParameter {
-      get { return (IValueLookupParameter<IntValue>)Parameters["Maximum"]; }
+    public IValueLookupParameter<IntMatrix> BoundsParameter {
+      get { return (IValueLookupParameter<IntMatrix>)Parameters["Bounds"]; }
     }
 
@@ -62 +59 @@
       Parameters.Add(new LookupParameter<IntegerVector>("IntegerVector", "The vector which should be manipulated."));
       Parameters.Add(new ValueLookupParameter<IntValue>("Length", "The length of the vector."));
-      Parameters.Add(new ValueLookupParameter<IntValue>("Minimum", "The inclusive lower bound for each element in the vector."));
-      Parameters.Add(new ValueLookupParameter<IntValue>("Maximum", "The exclusive upper bound for each element in the vector."));
+      Parameters.Add(new ValueLookupParameter<IntMatrix>("Bounds", "The bounds matrix can contain one row for each dimension with three columns specifying minimum (inclusive), maximum (exclusive), and step size. If less rows are given the matrix is cycled."));
     }
 
+    // BackwardsCompatibility3.3
+    #region Backwards compatible code, remove with 3.4
+    [StorableHook(HookType.AfterDeserialization)]
+    private void AfterDeserialization() {
+      if (!Parameters.ContainsKey("Bounds")) {
+        Parameters.Remove("Minimum");
+        Parameters.Remove("Maximum");
+        Parameters.Add(new ValueLookupParameter<IntMatrix>("Bounds", "The bounds matrix can contain one row for each dimension with three columns specifying minimum (inclusive), maximum (inclusive), and step size. If less rows are given the matrix is cycled."));
+      }
+    }
+    #endregion
+
     public sealed override IOperation Apply() {
-      IntegerVectorParameter.ActualValue = Create(RandomParameter.ActualValue, LengthParameter.ActualValue, MinimumParameter.ActualValue, MaximumParameter.ActualValue);
+      IntegerVectorParameter.ActualValue = Create(RandomParameter.ActualValue, LengthParameter.ActualValue, BoundsParameter.ActualValue);
       return base.Apply();
     }
 
-    protected abstract IntegerVector Create(IRandom random, IntValue length, IntValue minimum, IntValue maximum);
+    protected abstract IntegerVector Create(IRandom random, IntValue length, IntMatrix bounds);
   }
 }

branches/IntegerVectorEncoding/HeuristicLab.Encodings.IntegerVectorEncoding/3.3/Interfaces/IIntegerVectorCreator.cs

@@ -28 +28 @@
   /// An interface which represents an operator for creating vectors of int-valued data.
   /// </summary>
-  public interface IIntegerVectorCreator : IIntegerVectorOperator, ISolutionCreator {
+  public interface IIntegerVectorCreator : ISolutionCreator, IBoundedIntegerVectorOperator {
     IValueLookupParameter<IntValue> LengthParameter { get; }
-    IValueLookupParameter<IntValue> MinimumParameter { get; }
-    IValueLookupParameter<IntValue> MaximumParameter { get; }
     ILookupParameter<IntegerVector> IntegerVectorParameter { get; }
   }