Changeset 9161 for branches/LearningClassifierSystems/HeuristicLab.Encodings.ConditionActionEncoding/3.3/Reinforcement

Timestamp:

01/15/13 11:18:06 (12 years ago)

Author:

sforsten

Message:

#1980:

• added training and test partition to ConditionActionClassificationProblemData
• ClassifierFetcher only uses training partition

File:

• branches/LearningClassifierSystems/HeuristicLab.Encodings.ConditionActionEncoding/3.3/Reinforcement/ClassifierFetcher.cs (modified) (3 diffs)

branches/LearningClassifierSystems/HeuristicLab.Encodings.ConditionActionEncoding/3.3/Reinforcement/ClassifierFetcher.cs

@@ -20 +20 @@
 #endregion
 
+using System.Linq;
 using HeuristicLab.Common;
 using HeuristicLab.Core;
@@ -44 +45 @@
     #endregion
 
-    public override IDeepCloneable Clone(Cloner cloner) {
-      return new ClassifierFetcher(this, cloner);
+    private IConditionActionProblemData ProblemData {
+      get { return ProblemDataParameter.ActualValue; }
     }
+
     protected ClassifierFetcher(ClassifierFetcher original, Cloner cloner)
       : base(original, cloner) {
@@ -58 +60 @@
       Parameters.Add(new LookupParameter<IntValue>("Iteration"));
     }
+    public override IDeepCloneable Clone(Cloner cloner) {
+      return new ClassifierFetcher(this, cloner);
+    }
 
     public override IOperation Apply() {
-      Dataset dataset = ProblemDataParameter.ActualValue.Dataset;
-      int row = IterationParameter.ActualValue.Value % dataset.Rows;
-      CurrentClassifierToMatchParameter.ActualValue = ProblemDataParameter.ActualValue.FetchClassifier(row);
+      Dataset dataset = ProblemData.Dataset;
+      var trainingIndices = ProblemData.TrainingIndices.ToList();
+      int index = IterationParameter.ActualValue.Value % trainingIndices.Count;
+      CurrentClassifierToMatchParameter.ActualValue = ProblemDataParameter.ActualValue.FetchClassifier(trainingIndices[index]);
       return base.Apply();
     }