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

Timestamp:

01/14/13 15:23:17 (11 years ago)

Author:

sforsten

Message:

#1980:

• added XCSSolution, XCSModel, XCSClassifier to represent the xcs classifier
• XCSSolution also shows the current accuracy (training and test partition has to be added)
• added XCSSolutionAnalyzer to create a XCSSolution during the run of the algorithm
• added XCSModelView to show the xcs model
• fixed a bug in XCSDeletionOperator (sometimes it deleted less classifiers than it should)
• moved some parameter from ConditionActionClassificationProblem to ConditionActionClassificationProblemData

File:

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

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

@@ -76 +76 @@
       get { return (IFixedValueParameter<IntValue>)Parameters["ThetaMinimalNumberOfActions"]; }
     }
-    //for test purposes
-    public IFixedValueParameter<IntValue> LengthParameter {
-      get { return (IFixedValueParameter<IntValue>)Parameters["Length"]; }
-    }
-    public IFixedValueParameter<IntValue> ActionPartLengthParameter {
-      get { return (IFixedValueParameter<IntValue>)Parameters["ActionPartLength"]; }
-    }
-    public IFixedValueParameter<IntMatrix> BoundsParameter {
-      get { return (IFixedValueParameter<IntMatrix>)Parameters["Bounds"]; }
-    }
     #endregion
 
@@ -120 +110 @@
     }
     IParameter IConditionActionProblem.ActionExecuterParameter { get { return ActionExecuterParameter; } }
-    public CombinedIntegerVectorClassifierFetcher ClassifierFetcher {
+    public ClassifierFetcher ClassifierFetcher {
       get { return ClassifierFetcherParameter.Value; }
     }
-    public ValueParameter<CombinedIntegerVectorClassifierFetcher> ClassifierFetcherParameter {
-      get { return (ValueParameter<CombinedIntegerVectorClassifierFetcher>)Parameters[ClassifierFetcherParameterName]; }
+    public ValueParameter<ClassifierFetcher> ClassifierFetcherParameter {
+      get { return (ValueParameter<ClassifierFetcher>)Parameters[ClassifierFetcherParameterName]; }
     }
     IClassifierFetcher IConditionActionProblem.ClassifierFetcher { get { return ClassifierFetcher; } }
@@ -150 +140 @@
     IParameter IConditionActionProblem.CoveringSolutionCreatorParameter {
       get { return CoveringSolutionCreatorParameter; }
+    }
+    private XCSSolutionAnalyzer XCSSolutionAnalyzer {
+      get { return Operators.OfType<XCSSolutionAnalyzer>().FirstOrDefault(); }
     }
     #endregion
@@ -170 +163 @@
     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)));
-      Parameters.Add(new FixedValueParameter<IntValue>("ActionPartLength", "The operator to create a solution.", new IntValue(1)));
-      int[,] elements = new int[,] { { 0, 3 }, { 0, 3 }, { 0, 3 }, { 0, 3 }, { 0, 3 }, { 0, 3 }, { 0, 2 } };
-      Parameters.Add(new FixedValueParameter<IntMatrix>("Bounds", "The operator to create a solution.", new IntMatrix(elements)));
       Parameters.Add(new ValueParameter<ConditionActionClassificationProblemData>("ProblemData", "", problemData));
       Parameters.Add(new FixedValueParameter<DoubleValue>("PositiveReward", "", new DoubleValue(1000)));
@@ -182 +171 @@
 
       Parameters.Add(new ValueParameter<IActionExecuter>(ActionExecuterParameterName, "", new ActionExecuter()));
-      Parameters.Add(new ValueParameter<CombinedIntegerVectorClassifierFetcher>(ClassifierFetcherParameterName, "", new CombinedIntegerVectorClassifierFetcher()));
+      Parameters.Add(new ValueParameter<ClassifierFetcher>(ClassifierFetcherParameterName, "", new ClassifierFetcher()));
       Parameters.Add(new FixedValueParameter<ItemSet<IClassifier>>("PossibleActions"));
       Parameters.Add(new FixedValueParameter<ItemSet<CombinedIntegerVector>>("PossibleActionsConcreteClass"));
@@ -196 +185 @@
       Evaluator.InitialPredictionParameter.ActualName = "InitialPrediction";
 
-      SolutionCreator.ActionPartLengthParameter.ActualName = ActionPartLengthParameter.Name;
-      SolutionCreator.LengthParameter.ActualName = LengthParameter.Name;
-      SolutionCreator.BoundsParameter.ActualName = BoundsParameter.Name;
+      SolutionCreator.ActionPartLengthParameter.ActualName = ProblemData.ActionLengthParameter.Name;
+      SolutionCreator.LengthParameter.ActualName = ProblemData.LengthParameter.Name;
+      SolutionCreator.BoundsParameter.ActualName = ProblemData.BoundsParameter.Name;
 
       coveringSolutionCreator.ChangeSymbolProbabilityParameter.ActualName = ChangeSymbolProbabilityInCoveringParameter.Name;
@@ -204 +193 @@
       coveringSolutionCreator.CreatedClassifierParameter.ActualName = "CombinedIntegerVector";
 
-      ClassifierFetcher.ActionPartLengthParameter.ActualName = ActionPartLengthParameter.Name;
-      ClassifierFetcher.BoundsParameter.ActualName = BoundsParameter.Name;
       ClassifierFetcher.ProblemDataParameter.ActualName = ProblemDataParameter.Name;
 
@@ -217 +204 @@
       ThetaMinimalNumberOfActions.Value = PossibleActions.Count;
 
-      BoundsParameter.ValueChanged += new System.EventHandler(BoundsParameter_ValueChanged);
-      LengthParameter.ValueChanged += new System.EventHandler(LengthParameter_ValueChanged);
-      ActionPartLengthParameter.ValueChanged += new System.EventHandler(ActionPartLengthParameter_ValueChanged);
-    }
-
-    #region event handler
-    private void ActionPartLengthParameter_ValueChanged(object sender, System.EventArgs e) {
+      InitializeOperators();
+
+      problemData.Changed += new System.EventHandler(problemData_Changed);
+    }
+
+    private void problemData_Changed(object sender, System.EventArgs e) {
       SetPossibleActions();
     }
-    private void LengthParameter_ValueChanged(object sender, System.EventArgs e) {
-      SetPossibleActions();
-    }
-    private void BoundsParameter_ValueChanged(object sender, System.EventArgs e) {
-      SetPossibleActions();
-    }
-    #endregion
+
+    private void InitializeOperators() {
+      Operators.Add(new XCSSolutionAnalyzer());
+
+      ParameterizeAnalyzers();
+    }
+
+    private void ParameterizeAnalyzers() {
+      if (XCSSolutionAnalyzer != null) {
+        XCSSolutionAnalyzer.ClassifierParameter.ActualName = SolutionCreator.CombinedIntegerVectorParameter.ActualName;
+        XCSSolutionAnalyzer.PredictionParameter.ActualName = Evaluator.PredictionParameter.ActualName;
+        XCSSolutionAnalyzer.ErrorParameter.ActualName = Evaluator.ErrorParameter.ActualName;
+        XCSSolutionAnalyzer.FitnessParameter.ActualName = Evaluator.FitnessParameter.ActualName;
+        XCSSolutionAnalyzer.ExperienceParameter.ActualName = Evaluator.ExperienceParameter.ActualName;
+        XCSSolutionAnalyzer.AverageActionSetSizeParameter.ActualName = Evaluator.AverageActionSetSizeParameter.ActualName;
+        XCSSolutionAnalyzer.NumerosityParameter.ActualName = Evaluator.NumerosityParameter.ActualName;
+        XCSSolutionAnalyzer.TimestampParameter.ActualName = Evaluator.TimestampParameter.ActualName;
+        XCSSolutionAnalyzer.ProblemDataParameter.ActualName = ProblemDataParameter.Name;
+        XCSSolutionAnalyzer.ResultsParameter.ActualName = "Results";
+      }
+    }
 
     private void SetPossibleActions() {
       //get bounds of action
-      IntMatrix actionBounds = GetElementsOfBoundsForAction(BoundsParameter.Value, LengthParameter.Value.Value, ActionPartLengthParameter.Value.Value);
-      int actionLength = ActionPartLengthParameter.Value.Value;
-      int start = LengthParameter.Value.Value - actionLength;
+      IntMatrix actionBounds = GetElementsOfBoundsForAction(ProblemData.Bounds, ProblemData.Length.Value, ProblemData.ActionLength.Value);
+      int actionLength = ProblemData.ActionLength.Value;
+      int start = ProblemData.Length.Value - actionLength;
       int[] elements = new int[actionLength];
       int[] curPos = new int[actionLength];