Changeset 9175 for branches/LearningClassifierSystems/HeuristicLab.Encodings.ConditionActionEncoding/3.3/Analyzer/XCSSolutionAnalyzer.cs

Timestamp:

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

Author:

sforsten

Message:

#1980:

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

File:

• branches/LearningClassifierSystems/HeuristicLab.Encodings.ConditionActionEncoding/3.3/Analyzer/XCSSolutionAnalyzer.cs (modified) (4 diffs)

branches/LearningClassifierSystems/HeuristicLab.Encodings.ConditionActionEncoding/3.3/Analyzer/XCSSolutionAnalyzer.cs

@@ -31 +31 @@
   [Item("ConditionActionSolutionAnalyzer", "")]
   [StorableClass]
-  public sealed class XCSSolutionAnalyzer : SingleSuccessorOperator, IAnalyzer {
+  public abstract class XCSSolutionAnalyzer : SingleSuccessorOperator, IAnalyzer {
     public bool EnabledByDefault {
       get { return true; }
@@ -67 +67 @@
     }
 
+    public ResultCollection Results { get { return ResultsParameter.ActualValue; } }
+
     [StorableConstructor]
-    private XCSSolutionAnalyzer(bool deserializing) : base(deserializing) { }
-    private XCSSolutionAnalyzer(XCSSolutionAnalyzer original, Cloner cloner) : base(original, cloner) { }
-    public override IDeepCloneable Clone(Cloner cloner) {
-      return new XCSSolutionAnalyzer(this, cloner);
-    }
+    protected XCSSolutionAnalyzer(bool deserializing) : base(deserializing) { }
+    protected XCSSolutionAnalyzer(XCSSolutionAnalyzer original, Cloner cloner) : base(original, cloner) { }
     public XCSSolutionAnalyzer()
       : base() {
@@ -96 +95 @@
       ItemArray<DoubleValue> averageActionSetSizes = AverageActionSetSizeParameter.ActualValue;
       ItemArray<IntValue> numerosities = NumerosityParameter.ActualValue;
-      ResultCollection results = ResultsParameter.ActualValue;
       IConditionActionProblemData problemData = ProblemDataParameter.ActualValue;
 
@@ -108 +106 @@
       XCSModel xcsModel = new XCSModel(xcsClassifiers);
 
-      if (results.ContainsKey("XCSSolution")) {
-        results.Remove("XCSSolution");
-      }
-      results.Add(new Result("XCSSolution", xcsModel.CreateConditionActionSolution(problemData)));
-
+      UseCurrentXCSSolution(xcsModel.CreateConditionActionSolution(problemData));
       return base.Apply();
     }
+
+    protected abstract void UseCurrentXCSSolution(IXCSSolution xcsSolution);
   }
 }