Changeset 9175 for branches/LearningClassifierSystems/HeuristicLab.Problems.ConditionActionClassification/3.3

Timestamp:

01/21/13 16:33:47 (12 years ago)

Author:

sforsten

Message:

#1980:

• added BestTrainingXCSSolutionAnalyzer and CurrentXCSSolutionAnalyzer
• fixed bug: Equals method was not correct in CombinedIntegerVector

File:

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

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

@@ -149 +149 @@
       get { return CoveringSolutionCreatorParameter; }
     }
-    private XCSSolutionAnalyzer XCSSolutionAnalyzer {
-      get { return Operators.OfType<XCSSolutionAnalyzer>().FirstOrDefault(); }
-    }
     #endregion
 
@@ -226 +223 @@
 
     private void InitializeOperators() {
-      Operators.Add(new XCSSolutionAnalyzer());
+      Operators.Add(new BestTrainingXCSSolutionAnalyzer());
+      Operators.Add(new CurrentXCSSolutionAnalyzer());
 
       ParameterizeAnalyzers();
@@ -232 +230 @@
 
     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";
+      foreach (XCSSolutionAnalyzer xcsAnalyzer in Operators.Where(x => x is XCSSolutionAnalyzer)) {
+        xcsAnalyzer.ClassifierParameter.ActualName = SolutionCreator.CombinedIntegerVectorParameter.ActualName;
+        xcsAnalyzer.PredictionParameter.ActualName = Evaluator.PredictionParameter.ActualName;
+        xcsAnalyzer.ErrorParameter.ActualName = Evaluator.ErrorParameter.ActualName;
+        xcsAnalyzer.FitnessParameter.ActualName = Evaluator.FitnessParameter.ActualName;
+        xcsAnalyzer.ExperienceParameter.ActualName = Evaluator.ExperienceParameter.ActualName;
+        xcsAnalyzer.AverageActionSetSizeParameter.ActualName = Evaluator.AverageActionSetSizeParameter.ActualName;
+        xcsAnalyzer.NumerosityParameter.ActualName = Evaluator.NumerosityParameter.ActualName;
+        xcsAnalyzer.TimestampParameter.ActualName = Evaluator.TimestampParameter.ActualName;
+        xcsAnalyzer.ProblemDataParameter.ActualName = ProblemDataParameter.Name;
+        xcsAnalyzer.ResultsParameter.ActualName = "Results";
       }
     }