Changeset 9089 for branches/LearningClassifierSystems/HeuristicLab.Encodings.CombinedIntegerVectorEncoding/3.3/CombinedIntegerVectorCreator.cs

Timestamp:

12/27/12 19:14:51 (11 years ago)

Author:

sforsten

Message:

#1980:

• added ConditionActionClassificationProblem
• added ConditionActionEncoding
• added Manipulators, Crossovers and an LCSAdaptedGeneticAlgorithm
• changed LearningClassifierSystemMainLoop

Location:

branches/LearningClassifierSystems

Files:

• . (modified) (1 prop)
• HeuristicLab.Encodings.CombinedIntegerVectorEncoding/3.3 (modified) (1 prop)
• HeuristicLab.Encodings.CombinedIntegerVectorEncoding/3.3/CombinedIntegerVectorCreator.cs (modified) (3 diffs)

branches/LearningClassifierSystems/HeuristicLab.Encodings.CombinedIntegerVectorEncoding/3.3/CombinedIntegerVectorCreator.cs

@@ -23 +23 @@
 using HeuristicLab.Core;
 using HeuristicLab.Data;
-using HeuristicLab.Encodings.IntegerVectorEncoding;
+using HeuristicLab.Operators;
+using HeuristicLab.Optimization;
 using HeuristicLab.Parameters;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
@@ -33 +34 @@
   [Item("CombinedIntegerVectorCreator", "A base class for operators creating combined int-valued vectors.")]
   [StorableClass]
-  public abstract class CombinedIntegerVectorCreator : IntegerVectorCreator, ICombinedIntegerVectorCreator {
+  public abstract class CombinedIntegerVectorCreator : SingleSuccessorOperator, IStochasticOperator, ICombinedIntegerVectorCreator {
+    public override bool CanChangeName {
+      get { return false; }
+    }
+    public ILookupParameter<IRandom> RandomParameter {
+      get { return (LookupParameter<IRandom>)Parameters["Random"]; }
+    }
+    public IValueLookupParameter<IntValue> LengthParameter {
+      get { return (IValueLookupParameter<IntValue>)Parameters["Length"]; }
+    }
+    public IValueLookupParameter<IntMatrix> BoundsParameter {
+      get { return (IValueLookupParameter<IntMatrix>)Parameters["Bounds"]; }
+    }
+
     public IValueLookupParameter<IntValue> ActionPartLengthParameter {
       get { return (IValueLookupParameter<IntValue>)Parameters["ActionPartLength"]; }
@@ -44 +58 @@
     [StorableConstructor]
     protected CombinedIntegerVectorCreator(bool deserializing) : base(deserializing) { }
-    protected CombinedIntegerVectorCreator(IntegerVectorCreator original, Cloner cloner) : base(original, cloner) { }
+    protected CombinedIntegerVectorCreator(CombinedIntegerVectorCreator original, Cloner cloner) : base(original, cloner) { }
     protected CombinedIntegerVectorCreator()
       : base() {
+      Parameters.Add(new LookupParameter<IRandom>("Random", "The pseudo random number generator which should be used for stochastic manipulation operators."));
+      Parameters.Add(new ValueLookupParameter<IntValue>("Length", "The length of 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."));
       Parameters.Add(new LookupParameter<CombinedIntegerVector>("CombinedIntegerVector", "The vector which should be manipulated."));
       Parameters.Add(new ValueLookupParameter<IntValue>("ActionPartLength", "The length of the vector."));
     }
 
-    protected override IntegerVector Create(IRandom random, IntValue length, IntMatrix bounds) {
-      CombinedIntegerVectorParameter.ActualValue = Create(random, length, bounds, ActionPartLengthParameter.ActualValue);
-      return CombinedIntegerVectorParameter.ActualValue;
+    public sealed override IOperation Apply() {
+      CombinedIntegerVectorParameter.ActualValue = Create(RandomParameter.ActualValue, LengthParameter.ActualValue, BoundsParameter.ActualValue, ActionPartLengthParameter.ActualValue);
+      return base.Apply();
     }