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

Timestamp:

01/04/13 20:46:18 (12 years ago)

Author:

sforsten

Message:

#1980:

• added GA subsumption
• simplified deletion before covering
• simplified XCSDeletionOperator

Location:

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

Files:

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

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

@@ -101 +101 @@
         throw new ArgumentException("More classifiers with unique actions shall be created than unique actions are available.");
       }
+      if (count > 0) {
+        CurrentPopulationSizeParameter.ActualValue.Value += count;
 
-      CurrentPopulationSizeParameter.ActualValue.Value += count;
+        int current = CurrentScope.SubScopes.Count;
+        for (int i = 0; i < count; i++) {
+          CurrentScope.SubScopes.Add(new Scope((current + i).ToString()));
+        }
 
-      int current = CurrentScope.SubScopes.Count;
-      for (int i = 0; i < count; i++) {
-        CurrentScope.SubScopes.Add(new Scope((current + i).ToString()));
+        creator.ActionParameter.ActualName = "Action";
+        OperationCollection variableCreation = new OperationCollection() { Parallel = parallel };
+        OperationCollection creation = new OperationCollection();
+        OperationCollection evaluation = new OperationCollection() { Parallel = parallel };
+        for (int i = 0; i < count; i++) {
+          VariableCreator variableCreator = new VariableCreator();
+          int pos = RandomParameter.ActualValue.Next(clone.Count);
+          IClassifier action = clone.ElementAt(pos);
+          clone.Remove(action);
+          variableCreator.CollectedValues.Add(new ValueParameter<IClassifier>("Action", action));
+          variableCreation.Add(ExecutionContext.CreateOperation(variableCreator, CurrentScope.SubScopes[current + i]));
+          creation.Add(ExecutionContext.CreateOperation(creator, CurrentScope.SubScopes[current + i]));
+          evaluation.Add(ExecutionContext.CreateOperation(evaluator, CurrentScope.SubScopes[current + i]));
+        }
+        OperationCollection next = new OperationCollection();
+        next.Add(variableCreation);
+        next.Add(creation);
+        next.Add(evaluation);
+        next.Add(base.Apply());
+        return next;
+      } else {
+        return base.Apply();
       }
-
-      creator.ActionParameter.ActualName = "Action";
-      OperationCollection variableCreation = new OperationCollection() { Parallel = parallel };
-      OperationCollection creation = new OperationCollection();
-      OperationCollection evaluation = new OperationCollection() { Parallel = parallel };
-      for (int i = 0; i < count; i++) {
-        VariableCreator variableCreator = new VariableCreator();
-        int pos = RandomParameter.ActualValue.Next(clone.Count);
-        IClassifier action = clone.ElementAt(pos);
-        clone.Remove(action);
-        variableCreator.CollectedValues.Add(new ValueParameter<IClassifier>("Action", action));
-        variableCreation.Add(ExecutionContext.CreateOperation(variableCreator, CurrentScope.SubScopes[current + i]));
-        creation.Add(ExecutionContext.CreateOperation(creator, CurrentScope.SubScopes[current + i]));
-        evaluation.Add(ExecutionContext.CreateOperation(evaluator, CurrentScope.SubScopes[current + i]));
-      }
-      OperationCollection next = new OperationCollection();
-      next.Add(variableCreation);
-      next.Add(creation);
-      next.Add(evaluation);
-      next.Add(base.Apply());
-      return next;
     }
   }

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

@@ -20 +20 @@
 #endregion
 
+using System;
 using HeuristicLab.Common;
 using HeuristicLab.Core;
@@ -33 +34 @@
 
     #region Parameter Properties
+    public ILookupParameter<ItemArray<IClassifier>> ClassifiersParameter {
+      get { return (ILookupParameter<ItemArray<IClassifier>>)Parameters["Classifiers"]; }
+    }
+    public ILookupParameter<ItemArray<BoolValue>> MatchConditionParameter {
+      get { return (ILookupParameter<ItemArray<BoolValue>>)Parameters["MatchCondition"]; }
+    }
     public ILookupParameter<IntValue> MinimalNumberOfUniqueActionsParameter {
       get { return (ILookupParameter<IntValue>)Parameters["MinimalNumberOfUniqueActions"]; }
-    }
-    public ILookupParameter<IntValue> NumberOfUniqueActionsParameter {
-      get { return (ILookupParameter<IntValue>)Parameters["NumberOfUniqueActions"]; }
     }
     public ILookupParameter<IntValue> CurrentPopulationSizeParameter {
@@ -60 +64 @@
     public DoDeletionBeforeCoveringOperator()
       : base() {
+      Parameters.Add(new ScopeTreeLookupParameter<IClassifier>("Classifiers"));
+      Parameters.Add(new ScopeTreeLookupParameter<BoolValue>("MatchCondition"));
       Parameters.Add(new LookupParameter<IntValue>("MinimalNumberOfUniqueActions"));
-      Parameters.Add(new LookupParameter<IntValue>("NumberOfUniqueActions"));
       Parameters.Add(new LookupParameter<IntValue>("CurrentPopulationSize"));
       Parameters.Add(new LookupParameter<IntValue>("PopulationSize"));
@@ -72 +77 @@
 
     public override IOperation Apply() {
+      IItemSet<IClassifier> uniqueActions = new ItemSet<IClassifier>();
+      var classifiers = ClassifiersParameter.ActualValue;
+      var matchcondition = MatchConditionParameter.ActualValue;
+
+      if (classifiers.Length != matchcondition.Length) {
+        throw new ArgumentException("Number of classifiers is not equal to the number of 'MatchCondition' variables.");
+      }
+
+      for (int i = 0; i < classifiers.Length; i++) {
+        if (matchcondition[i].Value) {
+          uniqueActions.Add(classifiers[i].Action);
+        }
+      }
+
       int populationAfterCovering = MinimalNumberOfUniqueActionsParameter.ActualValue.Value
-                                    - NumberOfUniqueActionsParameter.ActualValue.Value
+                                    - uniqueActions.Count
                                     + CurrentPopulationSizeParameter.ActualValue.Value;
       BoolValue doDeletion = new BoolValue(populationAfterCovering > PopulationSizeParameter.ActualValue.Value);