Changeset 9175 for branches/LearningClassifierSystems/HeuristicLab.Encodings.ConditionActionEncoding

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

Location:

branches/LearningClassifierSystems/HeuristicLab.Encodings.ConditionActionEncoding/3.3

Files:

• Analyzer/BestTrainingXCSSolutionAnalyzer.cs (added)
• Analyzer/CurrentXCSSolutionAnalyzer.cs (added)
• Analyzer/XCSSolutionAnalyzer.cs (modified) (4 diffs)
• HeuristicLab.Encodings.ConditionActionEncoding-3.3.csproj (modified) (3 diffs)
• IClassifier.cs (modified) (1 diff)
• Interfaces/IConditionActionSolution.cs (modified) (1 diff)
• Reinforcement/ActionExecuter.cs (modified) (1 diff)
• XCSSolution.cs (modified) (2 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);
   }
 }

branches/LearningClassifierSystems/HeuristicLab.Encodings.ConditionActionEncoding/3.3/HeuristicLab.Encodings.ConditionActionEncoding-3.3.csproj

@@ -38 +38 @@
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="HeuristicLab.Analysis-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL" />
     <Reference Include="HeuristicLab.Collections-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
       <Private>False</Private>
@@ -56 +57 @@
       <Private>False</Private>
     </Reference>
+    <Reference Include="HeuristicLab.Optimization.Operators-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL" />
     <Reference Include="HeuristicLab.Parameters-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
       <Private>False</Private>
@@ -86 +88 @@
     <Compile Include="ActionSelection\MaxValueActionSelector.cs" />
     <Compile Include="ActionSelection\RandomActionSelector.cs" />
+    <Compile Include="Analyzer\BestTrainingXCSSolutionAnalyzer.cs" />
+    <Compile Include="Analyzer\CurrentXCSSolutionAnalyzer.cs" />
     <Compile Include="Analyzer\XCSSolutionAnalyzer.cs" />
     <Compile Include="Covering\CoveringOperator.cs" />

branches/LearningClassifierSystems/HeuristicLab.Encodings.ConditionActionEncoding/3.3/IClassifier.cs

@@ -41 +41 @@
     bool Equals(object obj);
     int GetHashCode();
-
-    //test
-    bool Identical(IClassifier classifier);
   }
 }

branches/LearningClassifierSystems/HeuristicLab.Encodings.ConditionActionEncoding/3.3/Interfaces/IConditionActionSolution.cs

@@ -31 +31 @@
     event EventHandler ModelChanged;
     event EventHandler ProblemDataChanged;
+
+    double TrainingAccuracy { get; }
+    double TestAccuracy { get; }
   }
 }

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

@@ -69 +69 @@
 
     public override IOperation Apply() {
-      if (SelectedActionParameter.ActualValue.Action.Equals(CurrentClassifierToMatchParameter.ActualValue.Action)) {
+      if (SelectedActionParameter.ActualValue.MatchAction(CurrentClassifierToMatchParameter.ActualValue)) {
         CurrentPayoffParameter.ActualValue = PositiveRewardParameter.ActualValue;
       } else {

branches/LearningClassifierSystems/HeuristicLab.Encodings.ConditionActionEncoding/3.3/XCSSolution.cs

@@ -86 +86 @@
       description = original.Description;
     }
+    public override IDeepCloneable Clone(Cloner cloner) {
+      return new XCSSolution(this, cloner);
+    }
     public XCSSolution(IConditionActionModel model, IConditionActionProblemData problemData)
       : base() {
@@ -118 +121 @@
 
       while (originalEnumerator.MoveNext() && estimatedActionEnumerator.MoveNext()) {
-        if (originalEnumerator.Current.Action.Equals(estimatedActionEnumerator.Current)) {
+        if (originalEnumerator.Current.MatchAction(estimatedActionEnumerator.Current)) {
           correctClassified++;
         }