Changeset 9194 for branches/LearningClassifierSystems/HeuristicLab.Encodings.ConditionActionEncoding/3.3/Covering

Timestamp:

01/28/13 17:54:46 (12 years ago)

Author:

sforsten

Message:

#1980:

• added necessary interface ICondition, IAction, IInput
• removed not used class MatchSelector and interface IMatchSelector
• added constructors to ItemDictionary
• added new encoding

Location:

branches/LearningClassifierSystems/HeuristicLab.Encodings.ConditionActionEncoding/3.3/Covering

Files:

• CoveringOperator.cs (modified) (4 diffs)
• DoDeletionBeforeCovering.cs (modified) (3 diffs)
• ICovering.cs (modified) (1 diff)
• ICoveringSolutionCreator.cs (modified) (1 diff)

branches/LearningClassifierSystems/HeuristicLab.Encodings.ConditionActionEncoding/3.3/Covering/CoveringOperator.cs

@@ -35 +35 @@
 
     #region Parameter Properties
-    public ILookupParameter<IItemSet<IClassifier>> ActionsInMatchSetParameter {
-      get { return (ILookupParameter<IItemSet<IClassifier>>)Parameters["ActionsInMatchSet"]; }
+    public ILookupParameter<IItemSet<IAction>> ActionsInMatchSetParameter {
+      get { return (ILookupParameter<IItemSet<IAction>>)Parameters["ActionsInMatchSet"]; }
     }
-    public ILookupParameter<IItemSet<IClassifier>> PossibleActionsParameter {
-      get { return (ILookupParameter<IItemSet<IClassifier>>)Parameters["PossibleActions"]; }
+    public ILookupParameter<IItemSet<IAction>> PossibleActionsParameter {
+      get { return (ILookupParameter<IItemSet<IAction>>)Parameters["PossibleActions"]; }
     }
     public ILookupParameter<IntValue> MinimalNumberOfUniqueActionsParameter {
@@ -77 +77 @@
     public CoveringOperator()
       : base() {
-      Parameters.Add(new LookupParameter<IClassifier>("CoverClassifier"));
-      Parameters.Add(new LookupParameter<IItemSet<IClassifier>>("ActionsInMatchSet"));
-      Parameters.Add(new LookupParameter<IItemSet<IClassifier>>("PossibleActions"));
+      Parameters.Add(new LookupParameter<IItemSet<IAction>>("ActionsInMatchSet"));
+      Parameters.Add(new LookupParameter<IItemSet<IAction>>("PossibleActions"));
       Parameters.Add(new LookupParameter<IntValue>("MinimalNumberOfUniqueActions"));
       Parameters.Add(new ValueLookupParameter<IOperator>("Evaluator"));
@@ -95 +94 @@
       bool parallel = ParallelParameter.ActualValue.Value;
 
-      IItemSet<IClassifier> clone = (IItemSet<IClassifier>)PossibleActionsParameter.ActualValue.Clone();
+      IItemSet<IAction> clone = (IItemSet<IAction>)PossibleActionsParameter.ActualValue.Clone();
       clone.ExceptWith(ActionsInMatchSetParameter.ActualValue);
 
@@ -116 +115 @@
           VariableCreator variableCreator = new VariableCreator();
           int pos = RandomParameter.ActualValue.Next(clone.Count);
-          IClassifier action = clone.ElementAt(pos);
+          IAction action = clone.ElementAt(pos);
           clone.Remove(action);
-          variableCreator.CollectedValues.Add(new ValueParameter<IClassifier>("Action", action));
+          variableCreator.CollectedValues.Add(new ValueParameter<IAction>("Action", action));
           variableCreation.Add(ExecutionContext.CreateOperation(variableCreator, CurrentScope.SubScopes[current + i]));
           creation.Add(ExecutionContext.CreateOperation(creator, CurrentScope.SubScopes[current + i]));

branches/LearningClassifierSystems/HeuristicLab.Encodings.ConditionActionEncoding/3.3/Covering/DoDeletionBeforeCovering.cs

@@ -55 +55 @@
       get { return (IValueLookupParameter<IntValue>)Parameters["NumberToDelete"]; }
     }
+    public ILookupParameter<IClassifierComparer> ClassifierComparerParameter {
+      get { return (ILookupParameter<IClassifierComparer>)Parameters["ClassifierComparer"]; }
+    }
     #endregion
 
@@ -71 +74 @@
       Parameters.Add(new ValueLookupParameter<BoolValue>("DoDeletion"));
       Parameters.Add(new ValueLookupParameter<IntValue>("NumberToDelete"));
+      Parameters.Add(new LookupParameter<IClassifierComparer>("ClassifierComparer"));
     }
     public override IDeepCloneable Clone(Cloner cloner) {
@@ -77 +81 @@
 
     public override IOperation Apply() {
-      IItemSet<IClassifier> uniqueActions = new ItemSet<IClassifier>();
+      IItemSet<IAction> uniqueActions = new ItemSet<IAction>(ClassifierComparerParameter.ActualValue);
       var classifiers = ClassifiersParameter.ActualValue;
       var matchcondition = MatchConditionParameter.ActualValue;

branches/LearningClassifierSystems/HeuristicLab.Encodings.ConditionActionEncoding/3.3/Covering/ICovering.cs

@@ -26 +26 @@
 namespace HeuristicLab.Encodings.ConditionActionEncoding {
   public interface ICovering : IStochasticOperator {
-    ILookupParameter<IItemSet<IClassifier>> ActionsInMatchSetParameter { get; }
-    ILookupParameter<IItemSet<IClassifier>> PossibleActionsParameter { get; }
+    ILookupParameter<IItemSet<IAction>> ActionsInMatchSetParameter { get; }
+    ILookupParameter<IItemSet<IAction>> PossibleActionsParameter { get; }
 
     ILookupParameter<IntValue> MinimalNumberOfUniqueActionsParameter { get; }

branches/LearningClassifierSystems/HeuristicLab.Encodings.ConditionActionEncoding/3.3/Covering/ICoveringSolutionCreator.cs

@@ -28 +28 @@
 namespace HeuristicLab.Encodings.ConditionActionEncoding {
   public interface ICoveringSolutionCreator : IOperator, IParameterizedNamedItem, INamedItem, IParameterizedItem, IItem, IContent, IDeepCloneable, ICloneable, IStochasticOperator {
-    ILookupParameter<IClassifier> CoverClassifierParameter { get; }
-    ILookupParameter<IClassifier> ActionParameter { get; }
+    ILookupParameter<IInput> CoverInputParameter { get; }
+    ILookupParameter<IAction> ActionParameter { get; }
 
     IValueLookupParameter<IClassifier> CreatedClassifierParameter { get; }