Changeset 9411 for branches/LearningClassifierSystems

Timestamp:

04/30/13 16:54:43 (12 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

Files:

• HeuristicLab.Algorithms.DataAnalysis/3.4/CrossValidation.cs (modified) (2 diffs)
• HeuristicLab.Algorithms.DataAnalysis/3.4/HeuristicLab.Algorithms.DataAnalysis-3.4.csproj (modified) (9 diffs)
• HeuristicLab.Algorithms.GAssist/3.3/GAssist.cs (modified) (1 diff)
• HeuristicLab.Algorithms.GAssist/3.3/HeuristicLab.Algorithms.GAssist-3.3.csproj (modified) (1 diff)
• HeuristicLab.Algorithms.LearningClassifierSystems/3.3/HeuristicLab.Algorithms.LearningClassifierSystems-3.3.csproj (modified) (1 diff)
• HeuristicLab.Encodings.CombinedIntegerVectorEncoding/3.3/HeuristicLab.Encodings.CombinedIntegerVectorEncoding-3.3.csproj (modified) (1 diff)
• HeuristicLab.Encodings.ConditionActionEncoding/3.3/Ensemble (added)
• HeuristicLab.Encodings.ConditionActionEncoding/3.3/Ensemble/ConditionActionEnsembleModel.cs (added)
• HeuristicLab.Encodings.ConditionActionEncoding/3.3/Ensemble/ConditionActionEnsembleProblemData.cs (added)
• HeuristicLab.Encodings.ConditionActionEncoding/3.3/Ensemble/ConditionActionEnsembleSolution.cs (added)
• HeuristicLab.Encodings.ConditionActionEncoding/3.3/HeuristicLab.Encodings.ConditionActionEncoding-3.3.csproj (modified) (4 diffs)
• HeuristicLab.Encodings.ConditionActionEncoding/3.3/Interfaces/IConditionActionEnsembleModel.cs (added)
• HeuristicLab.Encodings.ConditionActionEncoding/3.3/Interfaces/IConditionActionEnsembleProblemData.cs (added)
• HeuristicLab.Encodings.ConditionActionEncoding/3.3/Interfaces/IConditionActionEnsembleSolution.cs (added)
• HeuristicLab.Encodings.ConditionActionEncoding/3.3/Interfaces/IConditionActionProblem.cs (modified) (1 diff)
• HeuristicLab.Encodings.ConditionActionEncoding/3.3/Interfaces/IConditionActionProblemData.cs (modified) (3 diffs)
• HeuristicLab.Encodings.ConditionActionEncoding/3.3/Interfaces/IConditionActionSolution.cs (modified) (1 diff)
• HeuristicLab.Encodings.ConditionActionEncoding/3.3/XCSModel.cs (modified) (4 diffs)
• HeuristicLab.Encodings.DecisionList/3.3/Action/IntAction.cs (modified) (1 diff)
• HeuristicLab.Encodings.DecisionList/3.3/Action/StringAction.cs (modified) (1 diff)
• HeuristicLab.Encodings.DecisionList/3.3/DecisionList.cs (modified) (1 diff)
• HeuristicLab.Encodings.DecisionList/3.3/DecisionListNicheComparer.cs (deleted)
• HeuristicLab.Encodings.DecisionList/3.3/DecisionListSolution.cs (modified) (3 diffs)
• HeuristicLab.Encodings.DecisionList/3.3/HeuristicLab.Encodings.DecisionList-3.3.csproj (modified) (1 diff)
• HeuristicLab.Encodings.DecisionList/3.3/Interfaces/IDecisionListClassificationProblemData.cs (modified) (1 diff)
• HeuristicLab.Encodings.DecisionList/3.3/Interfaces/IDecisionListSolution.cs (modified) (1 diff)
• HeuristicLab.Encodings.DecisionList/3.3/Properties (modified) (1 prop)
• HeuristicLab.Encodings.DecisionList/3.3/Properties/AssemblyInfo.cs (deleted)
• HeuristicLab.Encodings.VariableVector/3.3/HeuristicLab.Encodings.VariableVector-3.3.csproj (modified) (1 diff)
• HeuristicLab.Encodings.VariableVector/3.3/VariableVectorAction.cs (modified) (1 diff)
• HeuristicLab.Encodings.VariableVector/3.3/VariableVectorActionComparer.cs (modified) (1 diff)
• HeuristicLab.Optimization.Operators.LCS/3.3/DefaultRule/DefaultRuleOperator.cs (modified) (2 diffs)
• HeuristicLab.Optimization.Operators.LCS/3.3/DefaultRule/IDefaultRuleOperator.cs (modified) (1 diff)
• HeuristicLab.Optimization.Operators.LCS/3.3/Discretizer/InitializeDiscretizersOperator.cs (modified) (2 diffs)
• HeuristicLab.Optimization.Operators.LCS/3.3/GAssist/Ensemble (added)
• HeuristicLab.Optimization.Operators.LCS/3.3/GAssist/Ensemble/GAssistEnsembleModel.cs (added)
• HeuristicLab.Optimization.Operators.LCS/3.3/GAssist/Ensemble/GAssistEnsembleProblemData.cs (added)
• HeuristicLab.Optimization.Operators.LCS/3.3/GAssist/Ensemble/GAssistEnsembleSolution.cs (added)
• HeuristicLab.Optimization.Operators.LCS/3.3/GAssist/GAssistNicheComparer.cs (added)
• HeuristicLab.Optimization.Operators.LCS/3.3/GAssist/IGAssistNichesProblemData.cs (deleted)
• HeuristicLab.Optimization.Operators.LCS/3.3/GAssist/IGAssistProblem.cs (deleted)
• HeuristicLab.Optimization.Operators.LCS/3.3/GAssist/ILAS/ILASOperator.cs (modified) (4 diffs)
• HeuristicLab.Optimization.Operators.LCS/3.3/GAssist/Interfaces/IGAssistEnsembleModel.cs (added)
• HeuristicLab.Optimization.Operators.LCS/3.3/GAssist/Interfaces/IGAssistEnsembleProblemData.cs (added)
• HeuristicLab.Optimization.Operators.LCS/3.3/GAssist/Interfaces/IGAssistEnsembleSolution.cs (added)
• HeuristicLab.Optimization.Operators.LCS/3.3/GAssist/Interfaces/IGAssistIndividual.cs (modified) (2 diffs)
• HeuristicLab.Optimization.Operators.LCS/3.3/GAssist/Interfaces/IGAssistModel.cs (added)
• HeuristicLab.Optimization.Operators.LCS/3.3/GAssist/Interfaces/IGAssistProblem.cs (added)
• HeuristicLab.Optimization.Operators.LCS/3.3/GAssist/Interfaces/IGAssistProblemData.cs (added)
• HeuristicLab.Optimization.Operators.LCS/3.3/GAssist/Interfaces/IGAssistSolution.cs (modified) (1 diff)
• HeuristicLab.Optimization.Operators.LCS/3.3/GAssist/MDL/MDLIterationOperator.cs (modified) (2 diffs)
• HeuristicLab.Optimization.Operators.LCS/3.3/HeuristicLab.Optimization.Operators.LCS-3.3.csproj (modified) (4 diffs)
• HeuristicLab.Optimization.Operators.LCS/3.3/Selection/INichingSingleObjectiveSelector.cs (modified) (1 diff)
• HeuristicLab.Optimization.Operators.LCS/3.3/Selection/NichingTournamentSelector.cs (modified) (3 diffs)
• HeuristicLab.Problems.CombinedIntegerVectorClassification/3.3/CombinedIntegerVectorClassificationProblem.cs (modified) (1 diff)
• HeuristicLab.Problems.CombinedIntegerVectorClassification/3.3/CombinedIntegerVectorClassificationProblemData.cs (modified) (1 diff)
• HeuristicLab.Problems.ConditionActionClassification/3.3/ConditionActionClassificationProblem.cs (modified) (3 diffs)
• HeuristicLab.Problems.ConditionActionClassification/3.3/ConditionActionClassificationProblemData.cs (modified) (2 diffs)
• HeuristicLab.Problems.DecisionListClassification/3.3/DecisionListClassificationProblem.cs (modified) (3 diffs)
• HeuristicLab.Problems.DecisionListClassification/3.3/DecisionListClassificationProblemData.cs (modified) (1 diff)
• HeuristicLab.Problems.VariableVectorClassification/3.3/VariableVectorClassificationProblem.cs (modified) (1 diff)
• HeuristicLab.Problems.VariableVectorClassification/3.3/VariableVectorClassificationProblemData.cs (modified) (1 diff)
• LearningClassifierSystem.sln (modified) (2 diffs)

branches/LearningClassifierSystems/HeuristicLab.Algorithms.DataAnalysis/3.4/CrossValidation.cs

@@ -29 +29 @@
 using HeuristicLab.Core;
 using HeuristicLab.Data;
+using HeuristicLab.Encodings.ConditionActionEncoding;
 using HeuristicLab.Optimization;
+using HeuristicLab.Optimization.Operators.LCS;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 using HeuristicLab.Problems.DataAnalysis;
@@ -405 +407 @@
         results.Add(result.Name, result.Value);
       }
+      foreach (IResult result in ExtractAndAggregateGAssistSolutions(resultCollections)) {
+        results.Add(result.Name, result.Value);
+      }
+      foreach (IResult result in ExtractAndAggregateConditionActionSolutions(resultCollections)) {
+        results.Add(result.Name, result.Value);
+      }
       results.Add("Execution Time", new TimeSpanValue(this.ExecutionTime));
       results.Add("CrossValidation Folds", new RunCollection(runs));
+    }
+
+    private IEnumerable<IResult> ExtractAndAggregateConditionActionSolutions(IEnumerable<KeyValuePair<string, IItem>> resultCollections) {
+      Dictionary<string, List<IConditionActionSolution>> resultSolutions = new Dictionary<string, List<IConditionActionSolution>>();
+      foreach (var result in resultCollections) {
+        var conditionActionSolution = result.Value as IConditionActionSolution;
+        if (conditionActionSolution != null) {
+          if (resultSolutions.ContainsKey(result.Key)) {
+            resultSolutions[result.Key].Add(conditionActionSolution);
+          } else {
+            resultSolutions.Add(result.Key, new List<IConditionActionSolution>() { conditionActionSolution });
+          }
+        }
+      }
+      List<IResult> aggregatedResults = new List<IResult>();
+      foreach (KeyValuePair<string, List<IConditionActionSolution>> solutions in resultSolutions) {
+        // clone manually to correctly clone references between cloned root objects 
+        Cloner cloner = new Cloner();
+        var problemDataClone = (IConditionActionProblemData)cloner.Clone(Problem.ProblemData);
+        // set partitions of problem data clone correctly
+        problemDataClone.TrainingPartition.Start = SamplesStart.Value; problemDataClone.TrainingPartition.End = SamplesEnd.Value;
+        problemDataClone.TestPartition.Start = SamplesStart.Value; problemDataClone.TestPartition.End = SamplesEnd.Value;
+        // clone models
+        var ensembleSolution = new ConditionActionEnsembleSolution(problemDataClone);
+        ensembleSolution.AddConditionActionSolutions(solutions.Value);
+
+        aggregatedResults.Add(new Result(solutions.Key + " (ensemble)", ensembleSolution));
+      }
+      List<IResult> flattenedResults = new List<IResult>();
+      CollectResultsRecursively("", aggregatedResults, flattenedResults);
+      return flattenedResults;
+    }
+
+    private IEnumerable<IResult> ExtractAndAggregateGAssistSolutions(IEnumerable<KeyValuePair<string, IItem>> resultCollections) {
+      Dictionary<string, List<IGAssistSolution>> resultSolutions = new Dictionary<string, List<IGAssistSolution>>();
+      foreach (var result in resultCollections) {
+        var gassistSolution = result.Value as IGAssistSolution;
+        if (gassistSolution != null) {
+          if (resultSolutions.ContainsKey(result.Key)) {
+            resultSolutions[result.Key].Add(gassistSolution);
+          } else {
+            resultSolutions.Add(result.Key, new List<IGAssistSolution>() { gassistSolution });
+          }
+        }
+      }
+      List<IResult> aggregatedResults = new List<IResult>();
+      foreach (KeyValuePair<string, List<IGAssistSolution>> solutions in resultSolutions) {
+        // clone manually to correctly clone references between cloned root objects 
+        Cloner cloner = new Cloner();
+        var problemDataClone = (IGAssistProblemData)cloner.Clone(Problem.ProblemData);
+        // set partitions of problem data clone correctly
+        problemDataClone.TrainingPartition.Start = SamplesStart.Value; problemDataClone.TrainingPartition.End = SamplesEnd.Value;
+        problemDataClone.TestPartition.Start = SamplesStart.Value; problemDataClone.TestPartition.End = SamplesEnd.Value;
+        // clone models
+        var ensembleSolution = new GAssistEnsembleSolution(problemDataClone);
+        ensembleSolution.AddGAssistSolutions(solutions.Value);
+
+        aggregatedResults.Add(new Result(solutions.Key + " (ensemble)", ensembleSolution));
+      }
+      List<IResult> flattenedResults = new List<IResult>();
+      CollectResultsRecursively("", aggregatedResults, flattenedResults);
+      return flattenedResults;
     }
 

branches/LearningClassifierSystems/HeuristicLab.Algorithms.DataAnalysis/3.4/HeuristicLab.Algorithms.DataAnalysis-3.4.csproj

@@ -43 +43 @@
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
-    <OutputPath>$(SolutionDir)\bin\</OutputPath>
+    <OutputPath>..\..\..\..\trunk\sources\bin\</OutputPath>
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
@@ -52 +52 @@
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
-    <OutputPath>$(SolutionDir)\bin\</OutputPath>
+    <OutputPath>..\..\..\..\trunk\sources\bin\</OutputPath>
     <DefineConstants>TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
@@ -62 +62 @@
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
     <DebugSymbols>true</DebugSymbols>
-    <OutputPath>$(SolutionDir)\bin\</OutputPath>
+    <OutputPath>..\..\..\..\trunk\sources\bin\</OutputPath>
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <DebugType>full</DebugType>
@@ -70 +70 @@
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
-    <OutputPath>$(SolutionDir)\bin\</OutputPath>
+    <OutputPath>..\..\..\..\trunk\sources\bin\</OutputPath>
     <DefineConstants>TRACE</DefineConstants>
     <DocumentationFile>
@@ -82 +82 @@
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x64' ">
     <DebugSymbols>true</DebugSymbols>
-    <OutputPath>$(SolutionDir)\bin\</OutputPath>
+    <OutputPath>..\..\..\..\trunk\sources\bin\</OutputPath>
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <DebugType>full</DebugType>
@@ -90 +90 @@
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x64' ">
-    <OutputPath>$(SolutionDir)\bin\</OutputPath>
+    <OutputPath>..\..\..\..\trunk\sources\bin\</OutputPath>
     <DefineConstants>TRACE</DefineConstants>
     <DocumentationFile>
@@ -102 +102 @@
   <ItemGroup>
     <Reference Include="ALGLIB-3.7.0, Version=3.7.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
-      <HintPath>..\..\bin\ALGLIB-3.7.0.dll</HintPath>
+      <HintPath>..\..\..\..\trunk\sources\bin\ALGLIB-3.7.0.dll</HintPath>
       <Private>False</Private>
     </Reference>
     <Reference Include="AutoDiff-1.0, Version=1.0.0.14388, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\bin\AutoDiff-1.0.dll</HintPath>
+      <HintPath>..\..\..\..\trunk\sources\bin\AutoDiff-1.0.dll</HintPath>
+    </Reference>
+    <Reference Include="HeuristicLab.Algorithms.GradientDescent-3.3">
+      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Algorithms.GradientDescent-3.3.dll</HintPath>
+    </Reference>
+    <Reference Include="HeuristicLab.Analysis-3.3">
+      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Analysis-3.3.dll</HintPath>
+    </Reference>
+    <Reference Include="HeuristicLab.Collections-3.3">
+      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Collections-3.3.dll</HintPath>
+    </Reference>
+    <Reference Include="HeuristicLab.Common-3.3">
+      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Common-3.3.dll</HintPath>
+    </Reference>
+    <Reference Include="HeuristicLab.Common.Resources-3.3">
+      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Common.Resources-3.3.dll</HintPath>
+    </Reference>
+    <Reference Include="HeuristicLab.Data-3.3">
+      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Data-3.3.dll</HintPath>
+    </Reference>
+    <Reference Include="HeuristicLab.Encodings.RealVectorEncoding-3.3">
+      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Encodings.RealVectorEncoding-3.3.dll</HintPath>
+    </Reference>
+    <Reference Include="HeuristicLab.Encodings.SymbolicExpressionTreeEncoding-3.4">
+      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Encodings.SymbolicExpressionTreeEncoding-3.4.dll</HintPath>
+    </Reference>
+    <Reference Include="HeuristicLab.Operators-3.3">
+      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Operators-3.3.dll</HintPath>
+    </Reference>
+    <Reference Include="HeuristicLab.Optimization-3.3">
+      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Optimization-3.3.dll</HintPath>
+    </Reference>
+    <Reference Include="HeuristicLab.Parameters-3.3">
+      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Parameters-3.3.dll</HintPath>
+    </Reference>
+    <Reference Include="HeuristicLab.Persistence-3.3">
+      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Persistence-3.3.dll</HintPath>
+    </Reference>
+    <Reference Include="HeuristicLab.PluginInfrastructure-3.3">
+      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.PluginInfrastructure-3.3.dll</HintPath>
+    </Reference>
+    <Reference Include="HeuristicLab.Problems.DataAnalysis.Symbolic-3.4">
+      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Problems.DataAnalysis.Symbolic-3.4.dll</HintPath>
+    </Reference>
+    <Reference Include="HeuristicLab.Problems.DataAnalysis.Symbolic.Classification-3.4">
+      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Problems.DataAnalysis.Symbolic.Classification-3.4.dll</HintPath>
+    </Reference>
+    <Reference Include="HeuristicLab.Problems.DataAnalysis.Symbolic.Regression-3.4">
+      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Problems.DataAnalysis.Symbolic.Regression-3.4.dll</HintPath>
+    </Reference>
+    <Reference Include="HeuristicLab.Problems.DataAnalysis.Symbolic.TimeSeriesPrognosis-3.4">
+      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Problems.DataAnalysis.Symbolic.TimeSeriesPrognosis-3.4.dll</HintPath>
+    </Reference>
+    <Reference Include="HeuristicLab.Problems.Instances-3.3">
+      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Problems.Instances-3.3.dll</HintPath>
+    </Reference>
+    <Reference Include="HeuristicLab.Random-3.3">
+      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Random-3.3.dll</HintPath>
     </Reference>
     <Reference Include="LibSVM-3.12, Version=3.12.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
-      <HintPath>..\..\bin\LibSVM-3.12.dll</HintPath>
+      <HintPath>..\..\..\..\trunk\sources\bin\LibSVM-3.12.dll</HintPath>
       <Private>False</Private>
     </Reference>
@@ -278 +335 @@
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\HeuristicLab.Algorithms.GradientDescent\3.3\HeuristicLab.Algorithms.GradientDescent-3.3.csproj">
-      <Project>{1256B945-EEA9-4BE4-9880-76B5B113F089}</Project>
-      <Name>HeuristicLab.Algorithms.GradientDescent</Name>
-      <Private>False</Private>
-    </ProjectReference>
-    <ProjectReference Include="..\..\HeuristicLab.Analysis\3.3\HeuristicLab.Analysis-3.3.csproj">
-      <Project>{887425B4-4348-49ED-A457-B7D2C26DDBF9}</Project>
-      <Name>HeuristicLab.Analysis-3.3</Name>
-      <Private>False</Private>
-    </ProjectReference>
-    <ProjectReference Include="..\..\HeuristicLab.Collections\3.3\HeuristicLab.Collections-3.3.csproj">
-      <Project>{958B43BC-CC5C-4FA2-8628-2B3B01D890B6}</Project>
-      <Name>HeuristicLab.Collections-3.3</Name>
-      <Private>False</Private>
-    </ProjectReference>
-    <ProjectReference Include="..\..\HeuristicLab.Common.Resources\3.3\HeuristicLab.Common.Resources-3.3.csproj">
-      <Project>{0E27A536-1C4A-4624-A65E-DC4F4F23E3E1}</Project>
-      <Name>HeuristicLab.Common.Resources-3.3</Name>
-      <Private>False</Private>
-    </ProjectReference>
-    <ProjectReference Include="..\..\HeuristicLab.Common\3.3\HeuristicLab.Common-3.3.csproj">
-      <Project>{A9AD58B9-3EF9-4CC1-97E5-8D909039FF5C}</Project>
-      <Name>HeuristicLab.Common-3.3</Name>
-      <Private>False</Private>
-    </ProjectReference>
     <ProjectReference Include="..\..\HeuristicLab.Core\3.3\HeuristicLab.Core-3.3.csproj">
       <Project>{C36BD924-A541-4A00-AFA8-41701378DDC5}</Project>
@@ -308 +340 @@
       <Private>False</Private>
     </ProjectReference>
-    <ProjectReference Include="..\..\HeuristicLab.Data\3.3\HeuristicLab.Data-3.3.csproj">
-      <Project>{BBAB9DF5-5EF3-4BA8-ADE9-B36E82114937}</Project>
-      <Name>HeuristicLab.Data-3.3</Name>
-      <Private>False</Private>
+    <ProjectReference Include="..\..\HeuristicLab.Encodings.ConditionActionEncoding\3.3\HeuristicLab.Encodings.ConditionActionEncoding-3.3.csproj">
+      <Project>{422fb262-0845-4969-8d16-12f057aa90b1}</Project>
+      <Name>HeuristicLab.Encodings.ConditionActionEncoding-3.3</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\HeuristicLab.Encodings.RealVectorEncoding\3.3\HeuristicLab.Encodings.RealVectorEncoding-3.3.csproj">
-      <Project>{BB6D334A-4BB6-4674-9883-31A6EBB32CAB}</Project>
-      <Name>HeuristicLab.Encodings.RealVectorEncoding-3.3</Name>
-      <Private>False</Private>
-    </ProjectReference>
-    <ProjectReference Include="..\..\HeuristicLab.Encodings.SymbolicExpressionTreeEncoding\3.4\HeuristicLab.Encodings.SymbolicExpressionTreeEncoding-3.4.csproj">
-      <Project>{06D4A186-9319-48A0-BADE-A2058D462EEA}</Project>
-      <Name>HeuristicLab.Encodings.SymbolicExpressionTreeEncoding-3.4</Name>
-      <Private>False</Private>
-    </ProjectReference>
-    <ProjectReference Include="..\..\HeuristicLab.Operators\3.3\HeuristicLab.Operators-3.3.csproj">
-      <Project>{23DA7FF4-D5B8-41B6-AA96-F0561D24F3EE}</Project>
-      <Name>HeuristicLab.Operators-3.3</Name>
-      <Private>False</Private>
-    </ProjectReference>
-    <ProjectReference Include="..\..\HeuristicLab.Optimization\3.3\HeuristicLab.Optimization-3.3.csproj">
-      <Project>{14AB8D24-25BC-400C-A846-4627AA945192}</Project>
-      <Name>HeuristicLab.Optimization-3.3</Name>
-      <Private>False</Private>
-    </ProjectReference>
-    <ProjectReference Include="..\..\HeuristicLab.Parameters\3.3\HeuristicLab.Parameters-3.3.csproj">
-      <Project>{56F9106A-079F-4C61-92F6-86A84C2D84B7}</Project>
-      <Name>HeuristicLab.Parameters-3.3</Name>
-      <Private>False</Private>
-    </ProjectReference>
-    <ProjectReference Include="..\..\HeuristicLab.Persistence\3.3\HeuristicLab.Persistence-3.3.csproj">
-      <Project>{102BC7D3-0EF9-439C-8F6D-96FF0FDB8E1B}</Project>
-      <Name>HeuristicLab.Persistence-3.3</Name>
-      <Private>False</Private>
-    </ProjectReference>
-    <ProjectReference Include="..\..\HeuristicLab.PluginInfrastructure\3.3\HeuristicLab.PluginInfrastructure-3.3.csproj">
-      <Project>{94186A6A-5176-4402-AE83-886557B53CCA}</Project>
-      <Name>HeuristicLab.PluginInfrastructure-3.3</Name>
-      <Private>False</Private>
-    </ProjectReference>
-    <ProjectReference Include="..\..\HeuristicLab.Problems.DataAnalysis.Symbolic.Classification\3.4\HeuristicLab.Problems.DataAnalysis.Symbolic.Classification-3.4.csproj">
-      <Project>{05BAE4E1-A9FA-4644-AA77-42558720159E}</Project>
-      <Name>HeuristicLab.Problems.DataAnalysis.Symbolic.Classification-3.4</Name>
-      <Private>False</Private>
-    </ProjectReference>
-    <ProjectReference Include="..\..\HeuristicLab.Problems.DataAnalysis.Symbolic.Regression\3.4\HeuristicLab.Problems.DataAnalysis.Symbolic.Regression-3.4.csproj">
-      <Project>{5AC82412-911B-4FA2-A013-EDC5E3F3FCC2}</Project>
-      <Name>HeuristicLab.Problems.DataAnalysis.Symbolic.Regression-3.4</Name>
-      <Private>False</Private>
-    </ProjectReference>
-    <ProjectReference Include="..\..\HeuristicLab.Problems.DataAnalysis.Symbolic.TimeSeriesPrognosis\3.4\HeuristicLab.Problems.DataAnalysis.Symbolic.TimeSeriesPrognosis-3.4.csproj">
-      <Project>{07486E68-1517-4B9D-A58D-A38E99AE71AB}</Project>
-      <Name>HeuristicLab.Problems.DataAnalysis.Symbolic.TimeSeriesPrognosis-3.4</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\HeuristicLab.Problems.DataAnalysis.Symbolic\3.4\HeuristicLab.Problems.DataAnalysis.Symbolic-3.4.csproj">
-      <Project>{3D28463F-EC96-4D82-AFEE-38BE91A0CA00}</Project>
-      <Name>HeuristicLab.Problems.DataAnalysis.Symbolic-3.4</Name>
-      <Private>False</Private>
+    <ProjectReference Include="..\..\HeuristicLab.Optimization.Operators.LCS\3.3\HeuristicLab.Optimization.Operators.LCS-3.3.csproj">
+      <Project>{f2c6d3b0-bd4f-4747-b13e-b18e53a2a09d}</Project>
+      <Name>HeuristicLab.Optimization.Operators.LCS-3.3</Name>
     </ProjectReference>
     <ProjectReference Include="..\..\HeuristicLab.Problems.DataAnalysis\3.4\HeuristicLab.Problems.DataAnalysis-3.4.csproj">
       <Project>{DF87C13E-A889-46FF-8153-66DCAA8C5674}</Project>
       <Name>HeuristicLab.Problems.DataAnalysis-3.4</Name>
-      <Private>False</Private>
-    </ProjectReference>
-    <ProjectReference Include="..\..\HeuristicLab.Problems.Instances\3.3\HeuristicLab.Problems.Instances-3.3.csproj">
-      <Project>{3540E29E-4793-49E7-8EE2-FEA7F61C3994}</Project>
-      <Name>HeuristicLab.Problems.Instances-3.3</Name>
-      <Private>False</Private>
-    </ProjectReference>
-    <ProjectReference Include="..\..\HeuristicLab.Random\3.3\HeuristicLab.Random-3.3.csproj">
-      <Project>{F4539FB6-4708-40C9-BE64-0A1390AEA197}</Project>
-      <Name>HeuristicLab.Random-3.3</Name>
       <Private>False</Private>
     </ProjectReference>

branches/LearningClassifierSystems/HeuristicLab.Algorithms.GAssist/3.3/GAssist.cs

@@ -338 +338 @@
     private void UpdateDiscretizers() {
       // change to add more
-      DiscretizersParameter.Value.AddRange(ApplicationManager.Manager.GetInstances<IDiscretizer>());
+      //DiscretizersParameter.Value.AddRange(ApplicationManager.Manager.GetInstances<IDiscretizer>());
+      DiscretizersParameter.Value.Add(new UniformWidthDiscretizer(4));
+      DiscretizersParameter.Value.Add(new UniformWidthDiscretizer(5));
+      DiscretizersParameter.Value.Add(new UniformWidthDiscretizer(6));
+      DiscretizersParameter.Value.Add(new UniformWidthDiscretizer(7));
+      DiscretizersParameter.Value.Add(new UniformWidthDiscretizer(8));
+      DiscretizersParameter.Value.Add(new UniformWidthDiscretizer(10));
+      DiscretizersParameter.Value.Add(new UniformWidthDiscretizer(15));
+      DiscretizersParameter.Value.Add(new UniformWidthDiscretizer(20));
+      DiscretizersParameter.Value.Add(new UniformWidthDiscretizer(25));
     }
 

branches/LearningClassifierSystems/HeuristicLab.Algorithms.GAssist/3.3/HeuristicLab.Algorithms.GAssist-3.3.csproj

@@ -115 +115 @@
       <Name>HeuristicLab.Optimization.Operators.LCS-3.3</Name>
     </ProjectReference>
+    <ProjectReference Include="..\..\HeuristicLab.Problems.DataAnalysis\3.4\HeuristicLab.Problems.DataAnalysis-3.4.csproj">
+      <Project>{df87c13e-a889-46ff-8153-66dcaa8c5674}</Project>
+      <Name>HeuristicLab.Problems.DataAnalysis-3.4</Name>
+    </ProjectReference>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />

branches/LearningClassifierSystems/HeuristicLab.Algorithms.LearningClassifierSystems/3.3/HeuristicLab.Algorithms.LearningClassifierSystems-3.3.csproj

@@ -133 +133 @@
       <Private>False</Private>
     </ProjectReference>
+    <ProjectReference Include="..\..\HeuristicLab.Problems.DataAnalysis\3.4\HeuristicLab.Problems.DataAnalysis-3.4.csproj">
+      <Project>{df87c13e-a889-46ff-8153-66dcaa8c5674}</Project>
+      <Name>HeuristicLab.Problems.DataAnalysis-3.4</Name>
+    </ProjectReference>
   </ItemGroup>
   <ItemGroup />

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

@@ -158 +158 @@
       <Private>False</Private>
     </ProjectReference>
+    <ProjectReference Include="..\..\HeuristicLab.Problems.DataAnalysis\3.4\HeuristicLab.Problems.DataAnalysis-3.4.csproj">
+      <Project>{df87c13e-a889-46ff-8153-66dcaa8c5674}</Project>
+      <Name>HeuristicLab.Problems.DataAnalysis-3.4</Name>
+    </ProjectReference>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />

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);

branches/LearningClassifierSystems/HeuristicLab.Encodings.DecisionList/3.3/Action/IntAction.cs

@@ -34 +34 @@
 
     public static IEqualityComparer<IGAssistNiche> Comparer {
-      get { return new DecisionListNicheComparer(); }
+      get { return new GAssistNicheComparer(); }
     }
     IEqualityComparer<IGAssistNiche> IGAssistNiche.Comparer {

branches/LearningClassifierSystems/HeuristicLab.Encodings.DecisionList/3.3/Action/StringAction.cs

@@ -34 +34 @@
 
     public static IEqualityComparer<IGAssistNiche> Comparer {
-      get { return new DecisionListNicheComparer(); }
+      get { return new GAssistNicheComparer(); }
     }
 

branches/LearningClassifierSystems/HeuristicLab.Encodings.DecisionList/3.3/DecisionList.cs

@@ -157 +157 @@
     }
 
-    public IGAssistSolution CreateGAssistSolution(IGAssistNichesProblemData problemData) {
+    public IGAssistSolution CreateGAssistSolution(IGAssistProblemData problemData) {
       return new DecisionListSolution(this, problemData);
+    }
+    #endregion
+
+    #region IGAssistModel Members
+    IEnumerable<IGAssistNiche> IGAssistModel.Evaluate(IEnumerable<IGAssistInput> input) {
+      return Evaluate(input);
+    }
+    public IEnumerable<IGAssistNiche> Evaluate(IEnumerable<IGAssistInput> input, out ItemSet<IItem> aliveRules, out double theoryLength) {
+      return Evaluate(input, out aliveRules, out theoryLength);
     }
     #endregion

branches/LearningClassifierSystems/HeuristicLab.Encodings.DecisionList/3.3/DecisionListSolution.cs

@@ -73 +73 @@
     }
 
-    DecisionList IDecisionListSolution.Model {
+    IGAssistModel IGAssistSolution.Model {
       get { return Model; }
     }
@@ -89 +89 @@
     }
 
-    public IGAssistNichesProblemData ProblemData {
-      get { return (IGAssistNichesProblemData)this[ProblemDataResultName].Value; }
+    public IGAssistProblemData ProblemData {
+      get { return (IGAssistProblemData)this[ProblemDataResultName].Value; }
       set {
         if (this[ProblemDataResultName].Value != value) {
@@ -110 +110 @@
       description = original.Description;
     }
-    public DecisionListSolution(DecisionList model, IGAssistNichesProblemData problemData)
+    public DecisionListSolution(DecisionList model, IGAssistProblemData problemData)
       : base() {
       name = ItemName;

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

@@ -98 +98 @@
     <Compile Include="DecisionListCrossover.cs" />
     <Compile Include="DecisionListManipulator.cs" />
-    <Compile Include="DecisionListNicheComparer.cs" />
     <Compile Include="DecisionListSolution.cs" />
     <Compile Include="Evaluator\MDLEvaluator.cs" />

branches/LearningClassifierSystems/HeuristicLab.Encodings.DecisionList/3.3/Interfaces/IDecisionListClassificationProblemData.cs

@@ -24 +24 @@
 
 namespace HeuristicLab.Encodings.DecisionList {
-  public interface IDecisionListClassificationProblemData : IGAssistNichesProblemData {
+  public interface IDecisionListClassificationProblemData : IGAssistProblemData {
     IValueParameter<Rule> SampleRuleParameter { get; }
   }

branches/LearningClassifierSystems/HeuristicLab.Encodings.DecisionList/3.3/Interfaces/IDecisionListSolution.cs

@@ -25 +25 @@
 namespace HeuristicLab.Encodings.DecisionList {
   public interface IDecisionListSolution : IGAssistSolution {
-    DecisionList Model { get; }
-    //IDecisionListClassificationProblemData ProblemData { get; set; }
+    new DecisionList Model { get; }
 
     event EventHandler ModelChanged;

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

@@ -129 +129 @@
       <Private>False</Private>
     </ProjectReference>
+    <ProjectReference Include="..\..\HeuristicLab.Problems.DataAnalysis\3.4\HeuristicLab.Problems.DataAnalysis-3.4.csproj">
+      <Project>{df87c13e-a889-46ff-8153-66dcaa8c5674}</Project>
+      <Name>HeuristicLab.Problems.DataAnalysis-3.4</Name>
+    </ProjectReference>
   </ItemGroup>
   <ItemGroup />

branches/LearningClassifierSystems/HeuristicLab.Encodings.VariableVector/3.3/VariableVectorAction.cs

@@ -83 +83 @@
       var targetCast = target as VariableVectorAction;
       if (targetCast == null) { return false; }
-      if (!this.Order.SequenceEqual(targetCast.Order)) { return false; }
-      foreach (var keyValuePair in targetCast.VariableDictionary) {
-        if (!VariableDictionary[keyValuePair.Key].MatchVariable(keyValuePair.Value)) {
+      foreach (var key in targetCast.VariableDictionary.Keys) {
+        if (!VariableDictionary.ContainsKey(key) || !VariableDictionary[key].MatchVariable(targetCast.VariableDictionary[key])) {
           return false;
         }

branches/LearningClassifierSystems/HeuristicLab.Encodings.VariableVector/3.3/VariableVectorActionComparer.cs

@@ -42 +42 @@
 
     public bool Equals(VariableVectorAction x, VariableVectorAction y) {
-      //if (!x.Order.SequenceEqual(y.Order)) return false;
       var xEnumerator = x.VariableDictionary.Keys.GetEnumerator();
       var yEnumerator = y.VariableDictionary.Keys.GetEnumerator();
-      while (xEnumerator.MoveNext() && yEnumerator.MoveNext())
-        foreach (var key in x.VariableDictionary.Keys) {
-          if (xEnumerator.Current != yEnumerator.Current ||
-            !x.VariableDictionary[xEnumerator.Current].Identical(y.VariableDictionary[yEnumerator.Current])) {
-            return false;
-          }
+      while (xEnumerator.MoveNext() && yEnumerator.MoveNext()) {
+        if (xEnumerator.Current != yEnumerator.Current ||
+          !x.VariableDictionary[xEnumerator.Current].Identical(y.VariableDictionary[yEnumerator.Current])) {
+          return false;
         }
+      }
       return !xEnumerator.MoveNext() && !yEnumerator.MoveNext();
     }

branches/LearningClassifierSystems/HeuristicLab.Optimization.Operators.LCS/3.3/DefaultRule/DefaultRuleOperator.cs

@@ -42 +42 @@
       get { return (IValueLookupParameter<IGAssistNiche>)Parameters["DefaultClass"]; }
     }
-    public ILookupParameter<IGAssistNichesProblemData> GAssistNichesProblemDataParameter {
-      get { return (ILookupParameter<IGAssistNichesProblemData>)Parameters["GAssistNichesProblemData"]; }
+    public ILookupParameter<IGAssistProblemData> GAssistNichesProblemDataParameter {
+      get { return (ILookupParameter<IGAssistProblemData>)Parameters["GAssistNichesProblemData"]; }
     }
     public ILookupParameter<ItemArray<IGAssistIndividual>> IndividualParameter {
@@ -63 +63 @@
       Parameters.Add(new ValueLookupParameter<IntValue>("Niches"));
       Parameters.Add(new ValueLookupParameter<IGAssistNiche>("DefaultClass"));
-      Parameters.Add(new LookupParameter<IGAssistNichesProblemData>("GAssistNichesProblemData"));
+      Parameters.Add(new LookupParameter<IGAssistProblemData>("GAssistNichesProblemData"));
       Parameters.Add(new ScopeTreeLookupParameter<IGAssistIndividual>("Individual"));
       Parameters.Add(new ValueLookupParameter<IOperator>("Evaluator"));

branches/LearningClassifierSystems/HeuristicLab.Optimization.Operators.LCS/3.3/DefaultRule/IDefaultRuleOperator.cs

@@ -28 +28 @@
     IValueLookupParameter<IntValue> NichesParameter { get; }
     IValueLookupParameter<IGAssistNiche> DefaultClassParameter { get; }
-    ILookupParameter<IGAssistNichesProblemData> GAssistNichesProblemDataParameter { get; }
+    ILookupParameter<IGAssistProblemData> GAssistNichesProblemDataParameter { get; }
     ILookupParameter<ItemArray<IGAssistIndividual>> IndividualParameter { get; }
     IValueLookupParameter<IOperator> EvaluatorParameter { get; }

branches/LearningClassifierSystems/HeuristicLab.Optimization.Operators.LCS/3.3/Discretizer/InitializeDiscretizersOperator.cs

@@ -33 +33 @@
 
     #region Parameter Properties
-    public ILookupParameter<IGAssistNichesProblemData> ProblemDataParameter {
-      get { return (ILookupParameter<IGAssistNichesProblemData>)Parameters["ProblemData"]; }
+    public ILookupParameter<IGAssistProblemData> ProblemDataParameter {
+      get { return (ILookupParameter<IGAssistProblemData>)Parameters["ProblemData"]; }
     }
     public ILookupParameter<ItemCollection<IDiscretizer>> DiscretizersParameter {
@@ -48 +48 @@
     public InitializeDiscretizersOperator()
       : base() {
-      Parameters.Add(new LookupParameter<IGAssistNichesProblemData>("ProblemData", ""));
+      Parameters.Add(new LookupParameter<IGAssistProblemData>("ProblemData", ""));
       Parameters.Add(new LookupParameter<ItemCollection<IDiscretizer>>("Discretizers", ""));
     }

branches/LearningClassifierSystems/HeuristicLab.Optimization.Operators.LCS/3.3/GAssist/ILAS/ILASOperator.cs

@@ -20 +20 @@
 #endregion
 
+using System;
 using System.Collections.Generic;
+using System.Linq;
 using HeuristicLab.Common;
 using HeuristicLab.Core;
@@ -37 +39 @@
       get { return (ILookupParameter<IRandom>)Parameters["Random"]; }
     }
-    public ILookupParameter<IGAssistNichesProblemData> ProblemDataParameter {
-      get { return (ILookupParameter<IGAssistNichesProblemData>)Parameters["ProblemData"]; }
+    public ILookupParameter<IGAssistProblemData> ProblemDataParameter {
+      get { return (ILookupParameter<IGAssistProblemData>)Parameters["ProblemData"]; }
     }
     public IValueLookupParameter<IntValue> NumberOfStrataParameter {
@@ -56 +58 @@
       : base() {
       Parameters.Add(new LookupParameter<IRandom>("Random", "The random generator to use."));
-      Parameters.Add(new LookupParameter<IGAssistNichesProblemData>("ProblemData", ""));
+      Parameters.Add(new LookupParameter<IGAssistProblemData>("ProblemData", ""));
       Parameters.Add(new ValueLookupParameter<IntValue>("NumberOfStrata", ""));
       Parameters.Add(new ValueLookupParameter<ItemList<ItemList<IntValue>>>("Strata", ""));
@@ -103 +105 @@
         }
 
+        if (strata.Any(x => x.Count() == 0)) {
+          throw new ArgumentException("At least one strata is empty. Use less strata or add more data.");
+        }
+
         StrataParameter.ActualValue = strata;
       }

branches/LearningClassifierSystems/HeuristicLab.Optimization.Operators.LCS/3.3/GAssist/Interfaces/IGAssistIndividual.cs

@@ -24 +24 @@
 
 namespace HeuristicLab.Optimization.Operators.LCS {
-  public interface IGAssistIndividual : IItem {
+  public interface IGAssistIndividual : IGAssistModel {
     IGAssistNiche Niche { get; }
     void SetNiche(IRandom random, IGAssistNiche niche);
@@ -30 +30 @@
     void ApplyMerge(IRandom random, double probability);
     void ApplyReinitialize(IRandom random, double probability, double oneProbability, IEnumerable<IDiscretizer> discretizers);
-
-    IGAssistSolution CreateGAssistSolution(IGAssistNichesProblemData problemData);
   }
 }

branches/LearningClassifierSystems/HeuristicLab.Optimization.Operators.LCS/3.3/GAssist/Interfaces/IGAssistSolution.cs

@@ -24 +24 @@
 namespace HeuristicLab.Optimization.Operators.LCS {
   public interface IGAssistSolution : IItem {
+    IGAssistModel Model { get; }
+    IGAssistProblemData ProblemData { get; set; }
+
     double TrainingAccuracy { get; }
     double TestAccuracy { get; }

branches/LearningClassifierSystems/HeuristicLab.Optimization.Operators.LCS/3.3/GAssist/MDL/MDLIterationOperator.cs

@@ -56 +56 @@
       get { return (ScopeTreeLookupParameter<IGAssistIndividual>)Parameters["Individual"]; }
     }
-    public LookupParameter<IGAssistNichesProblemData> ProblemDataParameter {
-      get { return (LookupParameter<IGAssistNichesProblemData>)Parameters["ProblemData"]; }
+    public LookupParameter<IGAssistProblemData> ProblemDataParameter {
+      get { return (LookupParameter<IGAssistProblemData>)Parameters["ProblemData"]; }
     }
     public IScopeTreeLookupParameter<DoubleValue> QualityParameter {
@@ -82 +82 @@
 
       Parameters.Add(new ScopeTreeLookupParameter<IGAssistIndividual>("Individual", ""));
-      Parameters.Add(new LookupParameter<IGAssistNichesProblemData>("ProblemData", ""));
+      Parameters.Add(new LookupParameter<IGAssistProblemData>("ProblemData", ""));
       Parameters.Add(new ScopeTreeLookupParameter<DoubleValue>("Quality", "The qualities of the trees that should be analyzed."));
       Parameters.Add(new LookupParameter<BoolValue>("Maximization", "The direction of optimization."));

branches/LearningClassifierSystems/HeuristicLab.Optimization.Operators.LCS/3.3/HeuristicLab.Optimization.Operators.LCS-3.3.csproj

@@ -46 +46 @@
       <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Common-3.3.dll</HintPath>
     </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">
       <SpecificVersion>False</SpecificVersion>
@@ -90 +94 @@
     <Compile Include="DefaultRule\AutoDefaultRule.cs" />
     <Compile Include="Discretizer\InitializeDiscretizersOperator.cs" />
-    <Compile Include="GAssist\IGAssistNichesProblemData.cs" />
+    <Compile Include="GAssist\GAssistNicheComparer.cs" />
+    <Compile Include="GAssist\Ensemble\GAssistEnsembleModel.cs" />
+    <Compile Include="GAssist\Ensemble\GAssistEnsembleProblemData.cs" />
+    <Compile Include="GAssist\Ensemble\GAssistEnsembleSolution.cs" />
+    <Compile Include="GAssist\Interfaces\IGAssistEnsembleProblemData.cs" />
+    <Compile Include="GAssist\Interfaces\IGAssistProblemData.cs" />
     <Compile Include="DefaultRule\MajorDefaultRule.cs" />
     <Compile Include="DefaultRule\DefaultRuleOperator.cs" />
@@ -98 +107 @@
     <Compile Include="Discretizer\UniformWidthDiscretizer.cs" />
     <Compile Include="Discretizer\IDiscretizer.cs" />
-    <Compile Include="GAssist\IGAssistProblem.cs" />
+    <Compile Include="GAssist\Interfaces\IGAssistProblem.cs" />
     <Compile Include="GAssist\ILAS\ILASOperator.cs" />
+    <Compile Include="GAssist\Interfaces\IGAssistEnsembleModel.cs" />
+    <Compile Include="GAssist\Interfaces\IGAssistEnsembleSolution.cs" />
     <Compile Include="GAssist\Interfaces\IGAssistIndividual.cs" />
     <Compile Include="GAssist\Interfaces\IGAssistIndividualCreator.cs" />
     <Compile Include="GAssist\Interfaces\IGAssistInput.cs" />
+    <Compile Include="GAssist\Interfaces\IGAssistModel.cs" />
     <Compile Include="GAssist\Interfaces\IGAssistNiche.cs" />
     <Compile Include="GAssist\Interfaces\IGAssistNicheEqualityComparer.cs" />
@@ -137 +149 @@
     </ProjectReference>
   </ItemGroup>
+  <ItemGroup />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <PropertyGroup>

branches/LearningClassifierSystems/HeuristicLab.Optimization.Operators.LCS/3.3/Selection/INichingSingleObjectiveSelector.cs

@@ -25 +25 @@
 namespace HeuristicLab.Optimization.Operators.LCS {
   public interface INichingSingleObjectiveSelector : ISingleObjectiveSelector {
-    ILookupParameter<IGAssistNichesProblemData> GAssistNichesProblemDataParameter { get; }
+    ILookupParameter<IGAssistProblemData> GAssistNichesProblemDataParameter { get; }
     ILookupParameter<BoolValue> NichingParameter { get; }
     IValueLookupParameter<IntValue> ParentsPerChildParameter { get; }

branches/LearningClassifierSystems/HeuristicLab.Optimization.Operators.LCS/3.3/Selection/NichingTournamentSelector.cs

@@ -39 +39 @@
       get { return (ValueLookupParameter<IntValue>)Parameters["GroupSize"]; }
     }
-    public ILookupParameter<IGAssistNichesProblemData> GAssistNichesProblemDataParameter {
-      get { return (LookupParameter<IGAssistNichesProblemData>)Parameters["GAssistNichesProblemData"]; }
+    public ILookupParameter<IGAssistProblemData> GAssistNichesProblemDataParameter {
+      get { return (LookupParameter<IGAssistProblemData>)Parameters["GAssistNichesProblemData"]; }
     }
     public ILookupParameter<BoolValue> NichingParameter {
@@ -61 +61 @@
       : base() {
       Parameters.Add(new ValueLookupParameter<IntValue>("GroupSize", "The size of the tournament group.", new IntValue(2)));
-      Parameters.Add(new LookupParameter<IGAssistNichesProblemData>("GAssistNichesProblemData", ""));
+      Parameters.Add(new LookupParameter<IGAssistProblemData>("GAssistNichesProblemData", ""));
       Parameters.Add(new LookupParameter<BoolValue>("Niching", ""));
       Parameters.Add(new ValueLookupParameter<IntValue>("ParentsPerChild", ""));
@@ -143 +143 @@
         }
       }
-
       return selected;
     }

branches/LearningClassifierSystems/HeuristicLab.Problems.CombinedIntegerVectorClassification/3.3/CombinedIntegerVectorClassificationProblem.cs

@@ -87 +87 @@
     public CombinedIntegerVectorClassificationProblem(CombinedIntegerVectorClassificationProblemData problemData, XCSEvaluator evaluator, UniformRandomCombinedIntegerVectorCreator solutionCreator, ICoveringSolutionCreator coveringSolutionCreator)
       : base(problemData, evaluator, solutionCreator, coveringSolutionCreator) {
-      Parameters.Add(new FixedValueParameter<CombinedIntegerVectorComparer>("ClassifierComparer", new CombinedIntegerVectorComparer()));
+      Parameters.Add(new FixedValueParameter<CombinedIntegerVectorComparer>("ClassifierComparer", problemData.ConcreteClassifierComparer));
       Parameters.Add(new FixedValueParameter<ItemSet<IAction>>("PossibleActions", new ItemSet<IAction>(ClassifierComparer)));
       Parameters.Add(new FixedValueParameter<ItemSet<CombinedIntegerVector>>("PossibleActionsConcreteClass", new ItemSet<CombinedIntegerVector>(ClassifierComparer)));

branches/LearningClassifierSystems/HeuristicLab.Problems.CombinedIntegerVectorClassification/3.3/CombinedIntegerVectorClassificationProblemData.cs

@@ -54 +54 @@
       get { return LengthParameter.Value; }
     }
-
     public IntValue ActionLength {
       get { return ActionLengthParameter.Value; }
     }
-
     public IntMatrix Bounds {
       get { return BoundsParameter.Value; }
+    }
+    public CombinedIntegerVectorComparer ConcreteClassifierComparer {
+      get { return new CombinedIntegerVectorComparer(); }
+    }
+    public override IClassifierComparer ClassifierComparer {
+      get { return ConcreteClassifierComparer; }
     }
     #endregion

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

@@ -29 +29 @@
 using HeuristicLab.Parameters;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
+using HeuristicLab.Problems.DataAnalysis;
 using HeuristicLab.Problems.Instances;
 
@@ -82 +83 @@
 
     #region properties
-    IParameter IConditionActionProblem.ProblemDataParameter {
-      get { return ProblemDataParameter; }
-    }
     IConditionActionProblemData IConditionActionProblem.ProblemData {
       get { return ProblemData; }
@@ -234 +232 @@
       ProblemData = data;
     }
+
+    #region IDataAnalysisProblem Members
+    IParameter DataAnalysis.IDataAnalysisProblem.ProblemDataParameter {
+      get { return ProblemDataParameter; }
+    }
+    IDataAnalysisProblemData IDataAnalysisProblem.ProblemData {
+      get { return ProblemData; }
+    }
+    public event EventHandler ProblemDataChanged;
+    #endregion
   }
 }

branches/LearningClassifierSystems/HeuristicLab.Problems.ConditionActionClassification/3.3/ConditionActionClassificationProblemData.cs

@@ -108 +108 @@
              TestPartition.Start <= index && index < TestPartition.End;
     }
+
+    public abstract IClassifierComparer ClassifierComparer { get; }
     #endregion
 
@@ -193 +195 @@
     protected abstract void ActionConditionVariablesChanged();
     #endregion
+
+    #region IDataAnalysisProblemData Members
+    public bool IsEmpty {
+      get { return true; }
+    }
+    public ICheckedItemList<StringValue> InputVariables {
+      get { return ConditionVariables; }
+    }
+    public IEnumerable<string> AllowedInputVariables {
+      get { return AllowedConditionVariables; }
+    }
+    #endregion
   }
 }

branches/LearningClassifierSystems/HeuristicLab.Problems.DecisionListClassification/3.3/DecisionListClassificationProblem.cs

@@ -146 +146 @@
       autoDefaultRule.QualityParameter.ActualName = Evaluator.QualityParameter.ActualName;
       autoDefaultRule.GAssistNichesProblemDataParameter.ActualName = ProblemDataParameter.Name;
-      autoDefaultRule.NicheComparerParameter.Value = new DecisionListNicheComparer();
+      autoDefaultRule.NicheComparerParameter.Value = new GAssistNicheComparer();
       foreach (IDefaultRuleOperator op in Operators.OfType<IDefaultRuleOperator>()) {
         op.IndividualParameter.ActualName = SolutionCreator.DecisionListParameter.ActualName;
@@ -168 +168 @@
     }
 
-    IParameter IGAssistProblem.ProblemDataParameter {
-      get { return ProblemDataParameter; }
-    }
-
     public string NichingParameterName {
       get { return "Niching"; }
@@ -181 +177 @@
       ProblemData = data;
     }
+
+    #region IDataAnalysisProblem Members
+    IParameter IDataAnalysisProblem.ProblemDataParameter {
+      get { return ProblemDataParameter; }
+    }
+    IDataAnalysisProblemData IDataAnalysisProblem.ProblemData {
+      get { return ProblemData; }
+    }
+    public event System.EventHandler ProblemDataChanged;
+    #endregion
   }
 }

branches/LearningClassifierSystems/HeuristicLab.Problems.DecisionListClassification/3.3/DecisionListClassificationProblemData.cs

@@ -287 +287 @@
     }
     #endregion
+
+    #region IDataAnalysisProblemData Members
+    public bool IsEmpty {
+      get { return true; }
+    }
+    public ICheckedItemList<StringValue> InputVariables {
+      get { return ConditionVariables; }
+    }
+    public IEnumerable<string> AllowedInputVariables {
+      get { return AllowedConditionVariables; }
+    }
+    #endregion
   }
 }

branches/LearningClassifierSystems/HeuristicLab.Problems.VariableVectorClassification/3.3/VariableVectorClassificationProblem.cs

@@ -90 +90 @@
     public VariableVectorClassificationProblem(VariableVectorClassificationProblemData problemData, XCSEvaluator evaluator, UniformRandomVariableVectorCreator solutionCreator, IVariableVectorCoveringCreator coveringSolutionCreator)
       : base(problemData, evaluator, solutionCreator, coveringSolutionCreator) {
-      Parameters.Add(new FixedValueParameter<VariableVectorActionComparer>("ClassifierComparer", new VariableVectorActionComparer()));
+      Parameters.Add(new FixedValueParameter<VariableVectorActionComparer>("ClassifierComparer", problemData.ConcreteClassifierComparer));
       Parameters.Add(new FixedValueParameter<ItemSet<IAction>>("PossibleActions", new ItemSet<IAction>(ClassifierComparer)));
       Parameters.Add(new FixedValueParameter<ItemSet<VariableVectorAction>>("PossibleActionsConcreteClass", new ItemSet<VariableVectorAction>(ClassifierComparer)));

branches/LearningClassifierSystems/HeuristicLab.Problems.VariableVectorClassification/3.3/VariableVectorClassificationProblemData.cs

@@ -53 +53 @@
     public PercentValue SpreadPercentage {
       get { return SpreadPercentageParameter.Value; }
+    }
+
+    public VariableVectorActionComparer ConcreteClassifierComparer {
+      get { return new VariableVectorActionComparer(); }
+    }
+    public override IClassifierComparer ClassifierComparer {
+      get { return ConcreteClassifierComparer; }
     }
     #endregion

branches/LearningClassifierSystems/LearningClassifierSystem.sln

@@ -37 +37 @@
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Problems.Instances.LCS-3.3", "HeuristicLab.Problems.Instances.LCS\3.3\HeuristicLab.Problems.Instances.LCS-3.3.csproj", "{1CC7585E-DD22-41FA-869B-93DE41EA8936}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Algorithms.DataAnalysis-3.4", "HeuristicLab.Algorithms.DataAnalysis\3.4\HeuristicLab.Algorithms.DataAnalysis-3.4.csproj", "{2E782078-FA81-4B70-B56F-74CE38DAC6C8}"
 EndProject
 Global
@@ -180 +182 @@
     {1CC7585E-DD22-41FA-869B-93DE41EA8936}.Release|x64.ActiveCfg = Release|Any CPU
     {1CC7585E-DD22-41FA-869B-93DE41EA8936}.Release|x86.ActiveCfg = Release|Any CPU
+    {2E782078-FA81-4B70-B56F-74CE38DAC6C8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+    {2E782078-FA81-4B70-B56F-74CE38DAC6C8}.Debug|Any CPU.Build.0 = Debug|Any CPU
+    {2E782078-FA81-4B70-B56F-74CE38DAC6C8}.Debug|x64.ActiveCfg = Debug|x64
+    {2E782078-FA81-4B70-B56F-74CE38DAC6C8}.Debug|x64.Build.0 = Debug|x64
+    {2E782078-FA81-4B70-B56F-74CE38DAC6C8}.Debug|x86.ActiveCfg = Debug|x86
+    {2E782078-FA81-4B70-B56F-74CE38DAC6C8}.Debug|x86.Build.0 = Debug|x86
+    {2E782078-FA81-4B70-B56F-74CE38DAC6C8}.Release|Any CPU.ActiveCfg = Release|Any CPU
+    {2E782078-FA81-4B70-B56F-74CE38DAC6C8}.Release|Any CPU.Build.0 = Release|Any CPU
+    {2E782078-FA81-4B70-B56F-74CE38DAC6C8}.Release|x64.ActiveCfg = Release|x64
+    {2E782078-FA81-4B70-B56F-74CE38DAC6C8}.Release|x64.Build.0 = Release|x64
+    {2E782078-FA81-4B70-B56F-74CE38DAC6C8}.Release|x86.ActiveCfg = Release|x86
+    {2E782078-FA81-4B70-B56F-74CE38DAC6C8}.Release|x86.Build.0 = Release|x86
   EndGlobalSection
   GlobalSection(SolutionProperties) = preSolution
     HideSolutionNode = FALSE
   EndGlobalSection
-  GlobalSection(Performance) = preSolution
-    HasPerformanceSessions = true
-  EndGlobalSection
 EndGlobal