Changeset 9204 for branches/LearningClassifierSystems/HeuristicLab.Encodings.CombinedIntegerVectorEncoding/3.3/Covering

Timestamp:

02/04/13 16:16:38 (12 years ago)

Author:

sforsten

Message:

#1980:

• deleted not needed interface IMatching
• finished VariableVector encoding
• the algorithm LearningClassifierSystem is now independent of a specific encoding. It still needs the ConditionActionEncoding.
• merged r9191:9203 HeuristicLab.Core from trunk to branch

File:

• branches/LearningClassifierSystems/HeuristicLab.Encodings.CombinedIntegerVectorEncoding/3.3/Covering/CombinedIntegerVectorCoveringCreator.cs (modified) (3 diffs)

branches/LearningClassifierSystems/HeuristicLab.Encodings.CombinedIntegerVectorEncoding/3.3/Covering/CombinedIntegerVectorCoveringCreator.cs

@@ -22 +22 @@
 using HeuristicLab.Common;
 using HeuristicLab.Core;
-using HeuristicLab.Data;
 using HeuristicLab.Encodings.ConditionActionEncoding;
-using HeuristicLab.Operators;
-using HeuristicLab.Parameters;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 
@@ -31 +28 @@
   [Item("CombinedIntegerVectorCoveringCreator", "Description missing")]
   [StorableClass]
-  public class CombinedIntegerVectorCoveringCreator : SingleSuccessorOperator, ICoveringSolutionCreator {
-
-    #region Parameter Properties
-    public ILookupParameter<IInput> CoverInputParameter {
-      get { return (ILookupParameter<IInput>)Parameters["CoverInput"]; }
-    }
-    public ILookupParameter<IAction> ActionParameter {
-      get { return (ILookupParameter<IAction>)Parameters["Action"]; }
-    }
-    public IValueLookupParameter<IClassifier> CreatedClassifierParameter {
-      get { return (IValueLookupParameter<IClassifier>)Parameters["CreatedClassifier"]; }
-    }
-    public ILookupParameter<PercentValue> ChangeSymbolProbabilityParameter {
-      get { return (ILookupParameter<PercentValue>)Parameters["ChangeSymbolProbability"]; }
-    }
-    public ILookupParameter<IRandom> RandomParameter {
-      get { return (ILookupParameter<IRandom>)Parameters["Random"]; }
-    }
-
-    #endregion
+  public class CombinedIntegerVectorCoveringCreator : CoveringSolutionCreator, ICombinedIntegerVectorOperator {
 
     [StorableConstructor]
@@ -62 +40 @@
     public CombinedIntegerVectorCoveringCreator()
       : base() {
-      Parameters.Add(new LookupParameter<IInput>("CoverInput"));
-      Parameters.Add(new LookupParameter<IAction>("Action"));
-      Parameters.Add(new ValueLookupParameter<IClassifier>("CreatedClassifier"));
-      Parameters.Add(new LookupParameter<PercentValue>("ChangeSymbolProbability"));
-      Parameters.Add(new LookupParameter<IRandom>("Random"));
     }
 
-    public override IOperation Apply() {
-      CombinedIntegerVector newCondition = (CombinedIntegerVector)CoverInputParameter.ActualValue.Clone();
+    protected override IClassifier CreateCoveredClassifier(IInput input, IAction action, IRandom random, double changeSymbolProbability) {
+      CombinedIntegerVector newCondition = (CombinedIntegerVector)input.Clone();
 
-      CombinedIntegerVector condition = (CombinedIntegerVector)CoverInputParameter.ActualValue;
-      CombinedIntegerVector action = (CombinedIntegerVector)ActionParameter.ActualValue;
+      CombinedIntegerVector condition = (CombinedIntegerVector)input;
+      CombinedIntegerVector newAction = (CombinedIntegerVector)action;
 
-      newCondition = UniformSomePositionManipulator.ManipulateCondition(RandomParameter.ActualValue, condition, newCondition, ChangeSymbolProbabilityParameter.ActualValue.Value);
+      newCondition = UniformSomePositionManipulator.ManipulateCondition(random, condition, newCondition, changeSymbolProbability);
 
-      CreatedClassifierParameter.ActualValue = new CombinedIntegerVector(newCondition, newCondition.Bounds, action, action.Bounds);
-      return base.Apply();
+      return new CombinedIntegerVector(newCondition, newCondition.Bounds, newAction, newAction.Bounds);
     }
   }