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

Timestamp:

12/29/12 20:15:48 (11 years ago)

Author:

sforsten

Message:

#1980: implemented covering and changed SinglePointCrossover for CombinedIntegerVectorEncoding

Location:

branches/LearningClassifierSystems/HeuristicLab.Problems.ConditionActionClassification/3.3

Files:

• . (modified) (1 prop)
• Implementation/ConditionActionClassificationProblem.cs (modified) (7 diffs)

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

@@ -45 +45 @@
       get { return (IValueParameter<ConditionActionClassificationProblemData>)Parameters["ProblemData"]; }
     }
+    public IValueParameter<ICoveringSolutionCreator> CoveringSolutionCreatorParameter {
+      get { return (IValueParameter<ICoveringSolutionCreator>)Parameters["CoveringSolutionCreator"]; }
+    }
+    public IFixedValueParameter<PercentValue> ChangeSymbolProbabilityInCoveringParameter {
+      get { return (IFixedValueParameter<PercentValue>)Parameters["ChangeSymbolProbabilityInCovering"]; }
+    }
     public IFixedValueParameter<DoubleValue> PositiveRewardParameter {
       get { return (IFixedValueParameter<DoubleValue>)Parameters["PositiveReward"]; }
@@ -60 +66 @@
       get { return (IFixedValueParameter<DoubleValue>)Parameters["InitialFitness"]; }
     }
-    public IFixedValueParameter<IItemSet<IClassifier>> PossibleActionsParameter {
-      get { return (IFixedValueParameter<IItemSet<IClassifier>>)Parameters["PossibleActions"]; }
-    }
-    private IFixedValueParameter<IntValue> ThetaMinimalNumberOfActionsParameter {
+    public IFixedValueParameter<ItemSet<IClassifier>> PossibleActionsParameter {
+      get { return (IFixedValueParameter<ItemSet<IClassifier>>)Parameters["PossibleActions"]; }
+    }
+    public IFixedValueParameter<IntValue> ThetaMinimalNumberOfActionsParameter {
       get { return (IFixedValueParameter<IntValue>)Parameters["ThetaMinimalNumberOfActions"]; }
     }
@@ -94 +100 @@
       get { return PossibleActions; }
     }
-    public IItemSet<IClassifier> PossibleActions {
+    public ItemSet<IClassifier> PossibleActions {
       get { return PossibleActionsParameter.Value; }
     }
@@ -115 +121 @@
     private IntValue ThetaMinimalNumberOfActions {
       get { return ThetaMinimalNumberOfActionsParameter.Value; }
+    }
+    IParameter IConditionActionProblem.ThetaMinimalNumberOfActionsParameter {
+      get { return ThetaMinimalNumberOfActionsParameter; }
+    }
+    public ICoveringSolutionCreator CoveringSolutionCreator {
+      get { return CoveringSolutionCreatorParameter.Value; }
+    }
+    IParameter IConditionActionProblem.CoveringSolutionCreatorParameter {
+      get { return CoveringSolutionCreatorParameter; }
     }
     #endregion
@@ -130 +145 @@
       this(new ConditionActionClassificationProblemData(new Dataset(ConditionActionClassificationProblemData.defaultVariableNames, ConditionActionClassificationProblemData.defaultData),
         ConditionActionClassificationProblemData.defaultVariableNames.Take(ConditionActionClassificationProblemData.defaultVariableNames.Length - 1), ConditionActionClassificationProblemData.defaultVariableNames.Last().ToEnumerable()),
-        new XCSEvaluator(), new UniformRandomCombinedIntegerVectorCreator()) {
-    }
-
-    public ConditionActionClassificationProblem(ConditionActionClassificationProblemData problemData, XCSEvaluator evaluator, UniformRandomCombinedIntegerVectorCreator solutionCreator)
+        new XCSEvaluator(), new UniformRandomCombinedIntegerVectorCreator(), new CombinedIntegerVectorCoveringCreator()) {
+    }
+
+    public ConditionActionClassificationProblem(ConditionActionClassificationProblemData problemData, XCSEvaluator evaluator, UniformRandomCombinedIntegerVectorCreator solutionCreator, ICoveringSolutionCreator coveringSolutionCreator)
       : base(evaluator, solutionCreator) {
       Parameters.Add(new FixedValueParameter<IntValue>("Length", "The operator to create a solution.", new IntValue(7)));
@@ -151 +166 @@
       Parameters.Add(new FixedValueParameter<IntValue>("ThetaMinimalNumberOfActions", "Minimal number of actions, which have to be present in the match set, or else covering will occure."));
 
+      Parameters.Add(new ValueParameter<ICoveringSolutionCreator>("CoveringSolutionCreator", "", coveringSolutionCreator));
+      Parameters.Add(new FixedValueParameter<PercentValue>("ChangeSymbolProbabilityInCovering", "", new PercentValue(0.5)));
+
       Evaluator.InitialErrorParameter.ActualName = "InitialError";
       Evaluator.InitialFitnessParameter.ActualName = "InitialFitness";
@@ -158 +176 @@
       SolutionCreator.LengthParameter.ActualName = LengthParameter.Name;
       SolutionCreator.BoundsParameter.ActualName = BoundsParameter.Name;
+
+      coveringSolutionCreator.ChangeSymbolProbabilityParameter.ActualName = ChangeSymbolProbabilityInCoveringParameter.Name;
+      coveringSolutionCreator.CoverClassifierParameter.ActualName = ClassifierFetcher.CurrentClassifierToMatchParameter.ActualName;
+      coveringSolutionCreator.CreatedClassifierParameter.ActualName = "CombinedIntegerVector";
 
       ClassifierFetcher.ActionPartLengthParameter.ActualName = ActionPartLengthParameter.Name;