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

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/Subsumption

Files:

• ActionSetSubsumptionOperator.cs (moved) (moved from branches/LearningClassifierSystems/HeuristicLab.Encodings.ConditionActionEncoding/3.3/Subsumption/ActionSetSubsumptionoperator.cs) (5 diffs)
• CheckGASubsumptionOperator.cs (added)
• ExecuteGASubsumptionOperator.cs (added)
• IActionSetSubsumption.cs (modified) (1 diff)

branches/LearningClassifierSystems/HeuristicLab.Encodings.ConditionActionEncoding/3.3/Subsumption/ActionSetSubsumptionOperator.cs

@@ -31 +31 @@
   [Item("ActionSetSubsumptionoperator", "Description missing")]
   [StorableClass]
-  public class ActionSetSubsumptionoperator : SingleSuccessorOperator, IActionSetSubsumption {
+  public class ActionSetSubsumptionOperator : SingleSuccessorOperator, IActionSetSubsumption {
 
     #region Parameter Properties
@@ -46 +46 @@
       get { return (ILookupParameter<ItemArray<DoubleValue>>)Parameters["Errors"]; }
     }
+    public ILookupParameter<ItemArray<BoolValue>> HasBeenSubsumedParameter {
+      get { return (ILookupParameter<ItemArray<BoolValue>>)Parameters["HasBeenSubsumed"]; }
+    }
     public ILookupParameter<DoubleValue> ErrorZeroParameter {
       get { return (ILookupParameter<DoubleValue>)Parameters["ErrorZero"]; }
@@ -52 +55 @@
       get { return (ILookupParameter<IntValue>)Parameters["ThetaSubsumption"]; }
     }
-    protected ScopeParameter CurrentScopeParameter {
-      get { return (ScopeParameter)Parameters["CurrentScope"]; }
-    }
-    public IScope CurrentScope {
-      get { return CurrentScopeParameter.ActualValue; }
-    }
-
-    public string HasBeenSubsumedParameterName {
-      get { return "HasBeenSubsumed"; }
-    }
     #endregion
 
     [StorableConstructor]
-    protected ActionSetSubsumptionoperator(bool deserializing) : base(deserializing) { }
-    protected ActionSetSubsumptionoperator(ActionSetSubsumptionoperator original, Cloner cloner)
+    protected ActionSetSubsumptionOperator(bool deserializing) : base(deserializing) { }
+    protected ActionSetSubsumptionOperator(ActionSetSubsumptionOperator original, Cloner cloner)
       : base(original, cloner) {
     }
-    public ActionSetSubsumptionoperator()
+    public ActionSetSubsumptionOperator()
       : base() {
       Parameters.Add(new ScopeTreeLookupParameter<IClassifier>("Classifiers"));
@@ -75 +68 @@
       Parameters.Add(new ScopeTreeLookupParameter<IntValue>("Experiences"));
       Parameters.Add(new ScopeTreeLookupParameter<DoubleValue>("Errors"));
+      Parameters.Add(new ScopeTreeLookupParameter<BoolValue>("HasBeenSubsumed"));
       Parameters.Add(new LookupParameter<DoubleValue>("ErrorZero"));
       Parameters.Add(new LookupParameter<IntValue>("ThetaSubsumption"));
-      Parameters.Add(new ScopeParameter("CurrentScope"));
     }
     public override IDeepCloneable Clone(Cloner cloner) {
-      return new ActionSetSubsumptionoperator(this, cloner);
+      return new ActionSetSubsumptionOperator(this, cloner);
     }
 
     public override IOperation Apply() {
-      var subscopes = CurrentScope.SubScopes;
       var classifiers = ClassifiersParameter.ActualValue;
       var numerosities = NumerositiesParameter.ActualValue;
       var experiences = ExperiencesParameter.ActualValue;
+      var hasBeenSubsumed = HasBeenSubsumedParameter.ActualValue;
       var errors = ErrorsParameter.ActualValue;
-      if (subscopes.Count != classifiers.Length || subscopes.Count != numerosities.Length
-        || subscopes.Count != experiences.Length || subscopes.Count != errors.Length) {
-        throw new ArgumentException("The number of subscopes is not equal to the number of classifiers.");
+      if (errors.Length != classifiers.Length || errors.Length != numerosities.Length
+        || errors.Length != experiences.Length || errors.Length != hasBeenSubsumed.Length) {
+        throw new ArgumentException("The number of classifiers, error, numerosity, hasBeenSubsumed and experience values is not equal.");
       }
 
@@ -108 +101 @@
           if (classifiers[subsumptionClassifier].IsMoreGeneral(classifiers[i])) {
             numerosities[subsumptionClassifier].Value += numerosities[i].Value;
-            AddVariableToScope(subscopes[i], new BoolValue(true));
-          } else {
-            AddVariableToScope(subscopes[i], new BoolValue(false));
+            hasBeenSubsumed[i].Value = true;
           }
-        }
-      } else {
-        for (int i = 0; i < classifiers.Length; i++) {
-          AddVariableToScope(subscopes[i], new BoolValue(false));
         }
       }
 
       return base.Apply();
-    }
-
-    private void AddVariableToScope(IScope scope, BoolValue boolValue) {
-      if (scope.Variables.ContainsKey(HasBeenSubsumedParameterName)) {
-        scope.Variables[HasBeenSubsumedParameterName].Value = boolValue;
-      } else {
-        scope.Variables.Add(new Variable(HasBeenSubsumedParameterName, boolValue));
-      }
     }
 

branches/LearningClassifierSystems/HeuristicLab.Encodings.ConditionActionEncoding/3.3/Subsumption/IActionSetSubsumption.cs

@@ -31 +31 @@
     ILookupParameter<ItemArray<IntValue>> ExperiencesParameter { get; }
     ILookupParameter<ItemArray<DoubleValue>> ErrorsParameter { get; }
+    ILookupParameter<ItemArray<BoolValue>> HasBeenSubsumedParameter { get; }
     ILookupParameter<DoubleValue> ErrorZeroParameter { get; }
     ILookupParameter<IntValue> ThetaSubsumptionParameter { get; }
-
-    string HasBeenSubsumedParameterName { get; }
   }
 }