Changeset 9411 for branches/LearningClassifierSystems/HeuristicLab.Encodings.ConditionActionEncoding/3.3

Timestamp:

04/30/13 16:54:43 (11 years ago)

Author:

sforsten

Message:

#1980:

• added multiple discretizer to GAssist
• created ensembles for LCS problems and edited CrossValidation to use them

Location:

branches/LearningClassifierSystems/HeuristicLab.Encodings.ConditionActionEncoding/3.3

Files:

• Ensemble (added)
• Ensemble/ConditionActionEnsembleModel.cs (added)
• Ensemble/ConditionActionEnsembleProblemData.cs (added)
• Ensemble/ConditionActionEnsembleSolution.cs (added)
• HeuristicLab.Encodings.ConditionActionEncoding-3.3.csproj (modified) (4 diffs)
• Interfaces/IConditionActionEnsembleModel.cs (added)
• Interfaces/IConditionActionEnsembleProblemData.cs (added)
• Interfaces/IConditionActionEnsembleSolution.cs (added)
• Interfaces/IConditionActionProblem.cs (modified) (1 diff)
• Interfaces/IConditionActionProblemData.cs (modified) (3 diffs)
• Interfaces/IConditionActionSolution.cs (modified) (1 diff)
• XCSModel.cs (modified) (4 diffs)

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

@@ -46 +46 @@
     <Reference Include="HeuristicLab.Common-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
       <Private>False</Private>
+    </Reference>
+    <Reference Include="HeuristicLab.Common.Resources-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Common.Resources-3.3.dll</HintPath>
     </Reference>
     <Reference Include="HeuristicLab.Data-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
@@ -98 +102 @@
     <Compile Include="Deletion\CalculateNumberOfDeletionsOperator.cs" />
     <Compile Include="Deletion\XCSDeletionOperator.cs" />
+    <Compile Include="Ensemble\ConditionActionEnsembleModel.cs" />
+    <Compile Include="Ensemble\ConditionActionEnsembleProblemData.cs" />
+    <Compile Include="Ensemble\ConditionActionEnsembleSolution.cs" />
     <Compile Include="Evaluators\XCSEvaluator.cs" />
     <Compile Include="Evaluators\IConditionActionEvaluator.cs" />
@@ -105 +112 @@
     <Compile Include="GA\XCSAfterCrossoverOperator.cs" />
     <Compile Include="IClassifier.cs" />
+    <Compile Include="Interfaces\IConditionActionEnsembleModel.cs" />
+    <Compile Include="Interfaces\IConditionActionEnsembleProblemData.cs" />
+    <Compile Include="Interfaces\IConditionActionEnsembleSolution.cs" />
     <Compile Include="Interfaces\IConditionActionModel.cs" />
     <Compile Include="Interfaces\IConditionActionProblem.cs" />
@@ -151 +161 @@
     </ProjectReference>
   </ItemGroup>
+  <ItemGroup />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <PropertyGroup>

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

@@ -22 +22 @@
 using HeuristicLab.Core;
 using HeuristicLab.Optimization;
+using HeuristicLab.Problems.DataAnalysis;
 
 namespace HeuristicLab.Encodings.ConditionActionEncoding {
-  public interface IConditionActionProblem : IHeuristicOptimizationProblem {
+  public interface IConditionActionProblem : IHeuristicOptimizationProblem, IDataAnalysisProblem {
     string ChildName { get; }
 
-    IParameter ProblemDataParameter { get; }
-    IConditionActionProblemData ProblemData { get; }
+    new IConditionActionProblemData ProblemData { get; }
     IParameter ActionExecuterParameter { get; }
     IActionExecuter ActionExecuter { get; }

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

@@ -20 +20 @@
 #endregion
 
-using System;
 using System.Collections.Generic;
 using HeuristicLab.Core;
@@ -27 +26 @@
 
 namespace HeuristicLab.Encodings.ConditionActionEncoding {
-  public interface IConditionActionProblemData : INamedItem {
-    Dataset Dataset { get; }
+  public interface IConditionActionProblemData : IDataAnalysisProblemData {
     ICheckedItemList<StringValue> ConditionVariables { get; }
     ICheckedItemList<StringValue> ActionVariables { get; }
     IEnumerable<string> AllowedConditionVariables { get; }
     IEnumerable<string> AllowedActionVariables { get; }
-
-    IntRange TrainingPartition { get; }
-    IntRange TestPartition { get; }
-
-    IEnumerable<int> TrainingIndices { get; }
-    IEnumerable<int> TestIndices { get; }
-
-    bool IsTrainingSample(int index);
-    bool IsTestSample(int index);
 
     IEnumerable<IInput> FetchInput(IEnumerable<int> rows);
@@ -49 +38 @@
     IAction FetchAction(int rowNumber);
 
-    event EventHandler Changed;
+    IClassifierComparer ClassifierComparer { get; }
   }
 }

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

@@ -25 +25 @@
 
 namespace HeuristicLab.Encodings.ConditionActionEncoding {
-  public interface IConditionActionSolution : INamedItem, IStorableContent {
+  public interface IConditionActionSolution : IItem, IStorableContent {
     IConditionActionModel Model { get; }
     IConditionActionProblemData ProblemData { get; set; }

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

@@ -34 +34 @@
     public int ClassifierCount { get { return Count; } }
 
-    public IClassifierComparer ClassifierComparer { get; set; }
+    [Storable]
+    private IClassifierComparer comparer;
+    public IClassifierComparer ClassifierComparer {
+      get { return comparer; }
+      set { comparer = value; }
+    }
 
     [StorableConstructor]
@@ -42 +47 @@
       name = (string)original.name.Clone();
       description = (string)original.description.Clone();
+      if (original.comparer != null) {
+        comparer = (IClassifierComparer)original.comparer.Clone();
+      }
     }
     public override IDeepCloneable Clone(Cloner cloner) {
@@ -67 +75 @@
       }
 
-      if (matchedClassifiers.Count == 0) { return null; }
+      if (matchedClassifiers.Count == 0) {
+        return null;
+      }
 
       IDictionary<IAction, double> predictionArray = CreatePredictionArray(matchedClassifiers);
@@ -74 +84 @@
 
     private IDictionary<IAction, double> CreatePredictionArray(ItemCollection<XCSClassifier> matchedClassifiers) {
+      if (ClassifierComparer == null) {
+        throw new ArgumentException("No classifier comparer specified!");
+      }
       var predictionArray = new Dictionary<IAction, double>(ClassifierComparer);
       var fitnessSumPerAction = new Dictionary<IAction, double>(ClassifierComparer);