Changeset 9110 for branches/LearningClassifierSystems/HeuristicLab.Problems.ConditionActionClassification/3.3/Implementation/ConditionActionClassificationProblem.cs

Timestamp:

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

Author:

sforsten

Message:

#1980:

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

File:

• branches/LearningClassifierSystems/HeuristicLab.Problems.ConditionActionClassification/3.3/Implementation/ConditionActionClassificationProblem.cs (modified) (6 diffs)

branches/LearningClassifierSystems/HeuristicLab.Problems.ConditionActionClassification/3.3/Implementation/ConditionActionClassificationProblem.cs

@@ -70 +70 @@
       get { return (IFixedValueParameter<ItemSet<IClassifier>>)Parameters["PossibleActions"]; }
     }
+    public IFixedValueParameter<ItemSet<CombinedIntegerVector>> PossibleActionsConcreteClassParameter {
+      get { return (IFixedValueParameter<ItemSet<CombinedIntegerVector>>)Parameters["PossibleActionsConcreteClass"]; }
+    }
     public IFixedValueParameter<IntValue> ThetaMinimalNumberOfActionsParameter {
       get { return (IFixedValueParameter<IntValue>)Parameters["ThetaMinimalNumberOfActions"]; }
@@ -95 +98 @@
       get { return ProblemDataParameter.Value; }
     }
+    IParameter IConditionActionProblem.PossibleActionsConcreteClassParameter {
+      get { return PossibleActionsConcreteClassParameter; }
+    }
+    public ItemSet<CombinedIntegerVector> PossibleActionsConcreteClass {
+      get { return PossibleActionsConcreteClassParameter.Value; }
+    }
     IParameter IConditionActionProblem.PossibleActionsParameter {
       get { return PossibleActionsParameter; }
     }
-    IItemSet<IClassifier> IConditionActionProblem.PossibleActions {
-      get { return PossibleActions; }
-    }
+    //IItemSet<IClassifier> IConditionActionProblem.PossibleActions {
+    //  get { return PossibleActions; }
+    //}
     public ItemSet<IClassifier> PossibleActions {
       get { return PossibleActionsParameter.Value; }
@@ -121 +130 @@
 
 
-    public ActionSetSubsumptionoperator ActionSetSubsumptionOperator {
+    public ActionSetSubsumptionOperator ActionSetSubsumptionOperator {
       get { return ActionSetSubsumptionOperatorParameter.Value; }
     }
-    public ValueParameter<ActionSetSubsumptionoperator> ActionSetSubsumptionOperatorParameter {
-      get { return (ValueParameter<ActionSetSubsumptionoperator>)Parameters[ActionSetSubsumptionOperatorParameterName]; }
+    public ValueParameter<ActionSetSubsumptionOperator> ActionSetSubsumptionOperatorParameter {
+      get { return (ValueParameter<ActionSetSubsumptionOperator>)Parameters[ActionSetSubsumptionOperatorParameterName]; }
     }
     IActionSetSubsumption IConditionActionProblem.ActionSetSubsumptionOperator { get { return ActionSetSubsumptionOperator; } }
@@ -175 +184 @@
       Parameters.Add(new ValueParameter<CombinedIntegerVectorClassifierFetcher>(ClassifierFetcherParameterName, "", new CombinedIntegerVectorClassifierFetcher()));
       Parameters.Add(new FixedValueParameter<ItemSet<IClassifier>>("PossibleActions"));
+      Parameters.Add(new FixedValueParameter<ItemSet<CombinedIntegerVector>>("PossibleActionsConcreteClass"));
       Parameters.Add(new FixedValueParameter<IntValue>("ThetaMinimalNumberOfActions", "Minimal number of actions, which have to be present in the match set, or else covering will occure.", new IntValue(1)));
 
@@ -180 +190 @@
       Parameters.Add(new FixedValueParameter<PercentValue>("ChangeSymbolProbabilityInCovering", "", new PercentValue(0.5)));
 
-      Parameters.Add(new ValueParameter<ActionSetSubsumptionoperator>(ActionSetSubsumptionOperatorParameterName, "", new ActionSetSubsumptionoperator()));
+      Parameters.Add(new ValueParameter<ActionSetSubsumptionOperator>(ActionSetSubsumptionOperatorParameterName, "", new ActionSetSubsumptionOperator()));
 
       Evaluator.InitialErrorParameter.ActualName = "InitialError";
@@ -237 +247 @@
       }
       PossibleActions.Clear();
+      PossibleActionsConcreteClass.Clear();
       while (!done) {
         PossibleActions.Add(new CombinedIntegerVector(curPos, actionLength, actionBounds));
+        PossibleActionsConcreteClass.Add(new CombinedIntegerVector(curPos, actionLength, actionBounds));
         curPos = GetNextAction(curPos, actionBounds, out done);
       }