Changeset 9154 for branches/LearningClassifierSystems

Timestamp:

01/14/13 15:23:17 (12 years ago)

Author:

sforsten

Message:

#1980:

• added XCSSolution, XCSModel, XCSClassifier to represent the xcs classifier
• XCSSolution also shows the current accuracy (training and test partition has to be added)
• added XCSSolutionAnalyzer to create a XCSSolution during the run of the algorithm
• added XCSModelView to show the xcs model
• fixed a bug in XCSDeletionOperator (sometimes it deleted less classifiers than it should)
• moved some parameter from ConditionActionClassificationProblem to ConditionActionClassificationProblemData

Location:

branches/LearningClassifierSystems

Files:

• HeuristicLab.Algorithms.LearningClassifierSystems/3.3/HeuristicLab.Algorithms.LearningClassifierSystems-3.3.csproj (modified) (4 diffs)
• HeuristicLab.Algorithms.LearningClassifierSystems/3.3/LCSAdaptedGeneticAlgorithm.cs (modified) (8 diffs)
• HeuristicLab.Algorithms.LearningClassifierSystems/3.3/LearningClassifierSystem.cs (modified) (9 diffs)
• HeuristicLab.Algorithms.LearningClassifierSystems/3.3/LearningClassifierSystemMainLoop.cs (modified) (6 diffs)
• HeuristicLab.Encodings.CombinedIntegerVectorEncoding/3.3/HeuristicLab.Encodings.CombinedIntegerVectorEncoding-3.3.csproj (modified) (2 diffs)
• HeuristicLab.Encodings.CombinedIntegerVectorEncoding/3.3/Manipulator/UniformSomePositionManipulator.cs (modified) (1 diff)
• HeuristicLab.Encodings.ConditionActionEncoding/3.3/Analyzer (added)
• HeuristicLab.Encodings.ConditionActionEncoding/3.3/Analyzer/XCSSolutionAnalyzer.cs (added)
• HeuristicLab.Encodings.ConditionActionEncoding/3.3/Deletion/XCSDeletionOperator.cs (modified) (1 diff)
• HeuristicLab.Encodings.ConditionActionEncoding/3.3/HeuristicLab.Encodings.ConditionActionEncoding-3.3.csproj (modified) (5 diffs)
• HeuristicLab.Encodings.ConditionActionEncoding/3.3/Interfaces/IConditionActionModel.cs (added)
• HeuristicLab.Encodings.ConditionActionEncoding/3.3/Interfaces/IConditionActionProblemData.cs (modified) (2 diffs)
• HeuristicLab.Encodings.ConditionActionEncoding/3.3/Interfaces/IConditionActionSolution.cs (added)
• HeuristicLab.Encodings.ConditionActionEncoding/3.3/Interfaces/IXCSModel.cs (added)
• HeuristicLab.Encodings.ConditionActionEncoding/3.3/Interfaces/IXCSSolution.cs (added)
• HeuristicLab.Encodings.ConditionActionEncoding/3.3/Reinforcement/ClassifierFetcher.cs (added)
• HeuristicLab.Encodings.ConditionActionEncoding/3.3/XCSClassifier.cs (added)
• HeuristicLab.Encodings.ConditionActionEncoding/3.3/XCSModel.cs (added)
• HeuristicLab.Encodings.ConditionActionEncoding/3.3/XCSSolution.cs (added)
• HeuristicLab.Problems.ConditionActionClassification/3.3/HeuristicLab.Problems.ConditionActionClassification-3.3.csproj (modified) (3 diffs)
• HeuristicLab.Problems.ConditionActionClassification/3.3/Implementation/ConditionActionClassificationProblem.cs (modified) (8 diffs)
• HeuristicLab.Problems.ConditionActionClassification/3.3/Implementation/ConditionActionClassificationProblemData.cs (modified) (4 diffs)
• HeuristicLab.Problems.ConditionActionClassification/3.3/Reinforcement (deleted)
• HeuristicLab.Problems.XCS.Views (added)
• HeuristicLab.Problems.XCS.Views/3.3 (added)
• HeuristicLab.Problems.XCS.Views/3.3/HeuristicLab.Problems.XCS.Views-3.3.csproj (added)
• HeuristicLab.Problems.XCS.Views/3.3/HeuristicLab.snk (added)
• HeuristicLab.Problems.XCS.Views/3.3/Plugin.cs.frame (added)
• HeuristicLab.Problems.XCS.Views/3.3/Properties (added)
• HeuristicLab.Problems.XCS.Views/3.3/Properties/AssemblyInfo.cs.frame (added)
• HeuristicLab.Problems.XCS.Views/3.3/XCSModelView.Designer.cs (added)
• HeuristicLab.Problems.XCS.Views/3.3/XCSModelView.cs (added)
• LearningClassifierSystem.sln (modified) (2 diffs)

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

@@ -41 +41 @@
       <Private>False</Private>
     </Reference>
+    <Reference Include="HeuristicLab.Analysis-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
+      <Private>False</Private>
+    </Reference>
     <Reference Include="HeuristicLab.Collections-3.3">
       <HintPath>..\..\..\trunk\sources\bin\HeuristicLab.Collections-3.3.dll</HintPath>
@@ -57 +60 @@
       <Private>False</Private>
     </Reference>
-    <Reference Include="HeuristicLab.Encodings.IntegerVectorEncoding-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL" />
+    <Reference Include="HeuristicLab.Encodings.IntegerVectorEncoding-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
+      <Private>False</Private>
+    </Reference>
     <Reference Include="HeuristicLab.Operators-3.3">
       <HintPath>..\..\..\trunk\sources\bin\HeuristicLab.Operators-3.3.dll</HintPath>
@@ -86 +91 @@
       <Private>False</Private>
     </Reference>
-    <Reference Include="HeuristicLab.Selection-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL" />
+    <Reference Include="HeuristicLab.Selection-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
+      <Private>False</Private>
+    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
@@ -111 +118 @@
       <Project>{CE7163C5-BFFE-45F0-9BD0-E10EF24E8BD2}</Project>
       <Name>HeuristicLab.Encodings.CombinedIntegerVectorEncoding-3.3</Name>
+      <Private>False</Private>
     </ProjectReference>
     <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>
+      <Private>False</Private>
     </ProjectReference>
     <ProjectReference Include="..\..\HeuristicLab.Problems.ConditionActionClassification\3.3\HeuristicLab.Problems.ConditionActionClassification-3.3.csproj">
       <Project>{EA51D441-F6A3-41E1-9993-A2488E93C222}</Project>
       <Name>HeuristicLab.Problems.ConditionActionClassification-3.3</Name>
+      <Private>False</Private>
     </ProjectReference>
   </ItemGroup>

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

@@ -72 +72 @@
       get { return (ValueLookupParameter<VariableCollection>)Parameters["Results"]; }
     }
-    public ValueLookupParameter<IOperator> AnalyzerParameter {
-      get { return (ValueLookupParameter<IOperator>)Parameters["Analyzer"]; }
-    }
     public ValueLookupParameter<IntValue> EvaluatedSolutionsParameter {
       get { return (ValueLookupParameter<IntValue>)Parameters["EvaluatedSolutions"]; }
@@ -118 +115 @@
       Parameters.Add(new ValueLookupParameter<IntValue>("MaximumGenerations", "The maximum number of generations which should be processed."));
       Parameters.Add(new ValueLookupParameter<VariableCollection>("Results", "The variable collection where results should be stored."));
-      Parameters.Add(new ValueLookupParameter<IOperator>("Analyzer", "The operator used to analyze each generation."));
       Parameters.Add(new ValueLookupParameter<IntValue>("EvaluatedSolutions", "The number of times solutions have been evaluated."));
       Parameters.Add(new ValueLookupParameter<IntValue>("PopulationSize", "The size of the population."));
@@ -128 +124 @@
       VariableCreator variableCreator = new VariableCreator();
       ResultsCollector resultsCollector1 = new ResultsCollector();
-      Placeholder analyzer1 = new Placeholder();
       Placeholder selector = new Placeholder();
       SubScopesProcessor subScopesProcessor1 = new SubScopesProcessor();
@@ -141 +136 @@
       IntCounter intCounter = new IntCounter();
       Comparator comparator = new Comparator();
-      Placeholder analyzer2 = new Placeholder();
       ConditionalBranch conditionalBranch = new ConditionalBranch();
 
@@ -157 +151 @@
       variableCreator.CollectedValues.Add(new ValueParameter<IntValue>("Generations", new IntValue(0))); // Class GeneticAlgorithm expects this to be called Generations
 
-      resultsCollector1.CollectedValues.Add(new LookupParameter<IntValue>("Generations"));
+      //resultsCollector1.CollectedValues.Add(new LookupParameter<IntValue>("Iterations"));
       resultsCollector1.ResultsParameter.ActualName = "Results";
-
-      analyzer1.Name = "Analyzer";
-      analyzer1.OperatorParameter.ActualName = "Analyzer";
 
       tempIdAssigner.LeftSideParameter.ActualName = TEMPID;
@@ -220 +211 @@
       comparator.RightSideParameter.ActualName = "MaximumGenerations";
 
-      analyzer2.Name = "Analyzer";
-      analyzer2.OperatorParameter.ActualName = "Analyzer";
-
       conditionalBranch.ConditionParameter.ActualName = "Terminate";
       #endregion
@@ -229 +217 @@
       OperatorGraph.InitialOperator = variableCreator;
       variableCreator.Successor = resultsCollector1;
-      resultsCollector1.Successor = analyzer1;
-      analyzer1.Successor = tempIdAssigner;
+      resultsCollector1.Successor = tempIdAssigner;
       tempIdAssigner.Successor = setSubsumptionFalseSubScopesProcessor;
       setSubsumptionFalseSubScopesProcessor.Operator = setSubsumpByAssigner;
@@ -259 +246 @@
       doGASubsumptionBranch2.Successor = intCounter;
       intCounter.Successor = comparator;
-      comparator.Successor = analyzer2;
-      analyzer2.Successor = conditionalBranch;
+      comparator.Successor = conditionalBranch;
       conditionalBranch.FalseBranch = selector;
       conditionalBranch.TrueBranch = null;

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

@@ -21 +21 @@
 
 using System;
+using System.Linq;
+using HeuristicLab.Analysis;
 using HeuristicLab.Common;
 using HeuristicLab.Core;
 using HeuristicLab.Data;
 using HeuristicLab.Encodings.ConditionActionEncoding;
+using HeuristicLab.Operators;
 using HeuristicLab.Optimization;
+using HeuristicLab.Optimization.Operators;
 using HeuristicLab.Parameters;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
@@ -105 +109 @@
       get { return (ValueParameter<BoolValue>)Parameters["DoActionSetSubsumption"]; }
     }
+    private ValueParameter<MultiAnalyzer> AnalyzerParameter {
+      get { return (ValueParameter<MultiAnalyzer>)Parameters["Analyzer"]; }
+    }
+    private ValueParameter<IntValue> MaxIterationsParameter {
+      get { return (ValueParameter<IntValue>)Parameters["MaxIterations"]; }
+    }
     #endregion
 
@@ -180 +190 @@
       set { DoActionSetSubsumptionParameter.Value = value; }
     }
+    public IntValue MaxIterations {
+      get { return MaxIterationsParameter.Value; }
+      set { MaxIterationsParameter.Value = value; }
+    }
+    public MultiAnalyzer Analyzer {
+      get { return AnalyzerParameter.Value; }
+      set { AnalyzerParameter.Value = value; }
+    }
     private RandomCreator RandomCreator {
       get { return (RandomCreator)OperatorGraph.InitialOperator; }
     }
     public LearningClassifierSystemMainLoop MainLoop {
-      get { return (LearningClassifierSystemMainLoop)RandomCreator.Successor; }
+      get { return FindMainLoop(RandomCreator.Successor); }
     }
     #endregion
@@ -209 +227 @@
       Parameters.Add(new ValueParameter<BoolValue>("DoGASubsumption", "Specifies if offsprings are tested for possible logical subsumption by parents.", new BoolValue(true)));
       Parameters.Add(new ValueParameter<BoolValue>("DoActionSetSubsumption", "Specifies if action set is tested for subsuming classifiers.", new BoolValue(true)));
+      Parameters.Add(new ValueParameter<MultiAnalyzer>("Analyzer", "The operator used to analyze each generation.", new MultiAnalyzer()));
+      Parameters.Add(new ValueParameter<IntValue>("MaxIterations", "The maximum number of iterations.", new IntValue(1000)));
       #endregion
 
@@ -214 +234 @@
       RandomCreator randomCreator = new RandomCreator();
 
-      //ResultsCollector resultsCollector = new ResultsCollector();
+      ResultsCollector resultsCollector = new ResultsCollector();
       LearningClassifierSystemMainLoop mainLoop = new LearningClassifierSystemMainLoop();
 
@@ -222 +242 @@
       randomCreator.SetSeedRandomlyParameter.ActualName = SetSeedRandomlyParameter.Name;
       randomCreator.SetSeedRandomlyParameter.Value = null;
+
+      resultsCollector.ResultsParameter.ActualName = "Results";
+
+      mainLoop.AnalyzerParameter.ActualName = AnalyzerParameter.Name;
+      mainLoop.MaxIterationsParameter.ActualName = MaxIterationsParameter.Name;
       #endregion
 
       #region Create operator graph
       OperatorGraph.InitialOperator = randomCreator;
-      randomCreator.Successor = mainLoop;
+      randomCreator.Successor = resultsCollector;
+      resultsCollector.Successor = mainLoop;
       #endregion
+
+      UpdateAnalyzers();
     }
     private LearningClassifierSystem(LearningClassifierSystem original, Cloner cloner)
@@ -242 +270 @@
         ParameterizeEvaluator(Problem.Evaluator);
         MainLoop.SetCurrentProblem(Problem);
+        UpdateAnalyzers();
       }
       base.OnProblemChanged();
@@ -253 +282 @@
       MainLoop.SetCurrentProblem(Problem);
       base.Problem_SolutionCreatorChanged(sender, e);
+    }
+    protected override void Problem_OperatorsChanged(object sender, EventArgs e) {
+      UpdateAnalyzers();
+      base.Problem_OperatorsChanged(sender, e);
     }
 
@@ -262 +295 @@
       evaluator.ErrorZeroParameter.ActualName = ErrorZeroParameter.Name;
     }
+
+    private void UpdateAnalyzers() {
+      Analyzer.Operators.Clear();
+      if (Problem != null) {
+        foreach (IAnalyzer analyzer in Problem.Operators.OfType<IAnalyzer>()) {
+          Analyzer.Operators.Add(analyzer, analyzer.EnabledByDefault);
+        }
+      }
+    }
+
+    private LearningClassifierSystemMainLoop FindMainLoop(IOperator start) {
+      IOperator mainLoop = start;
+      while (mainLoop != null && !(mainLoop is LearningClassifierSystemMainLoop))
+        mainLoop = ((SingleSuccessorOperator)mainLoop).Successor;
+      if (mainLoop == null) return null;
+      else return (LearningClassifierSystemMainLoop)mainLoop;
+    }
   }
 }

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

@@ -55 +55 @@
       get { return (IConstrainedValueParameter<IOperator>)Parameters["AfterCrossover"]; }
     }
+    public LookupParameter<IntValue> MaxIterationsParameter {
+      get { return (LookupParameter<IntValue>)Parameters["MaxIterations"]; }
+    }
+    public ValueLookupParameter<IOperator> AnalyzerParameter {
+      get { return (ValueLookupParameter<IOperator>)Parameters["Analyzer"]; }
+    }
     #endregion
 
@@ -97 +103 @@
       XCSAfterCrossoverOperator afterCrossover = new XCSAfterCrossoverOperator();
       Parameters.Add(new ConstrainedValueParameter<IOperator>("AfterCrossover", "The operator used to select solutions for reproduction.", new ItemSet<IOperator>() { new XCSAfterCrossoverOperator() }, afterCrossover));
+      Parameters.Add(new LookupParameter<IntValue>("MaxIterations", "The maximum number of iterations the algorithm will do."));
+      Parameters.Add(new ValueLookupParameter<IOperator>("Analyzer", "The operator used to analyze each generation."));
       #endregion
+
+
+      //test
+      DataReducer testReducer = new DataReducer();
+      testReducer.TargetParameter.ActualName = "TestCurrentPopulation";
+      testReducer.ParameterToReduce.ActualName = "Numerosity";
+      testReducer.ReductionOperation.Value = new ReductionOperation(ReductionOperations.Sum);
+      testReducer.TargetOperation.Value = new ReductionOperation(ReductionOperations.Assign);
 
       #region Create operators
       VariableCreator variableCreator = new VariableCreator();
+      ResultsCollector resultsCollector = new ResultsCollector();
+      Placeholder finalAnalyzer = new Placeholder();
       ConditionalBranch initialPopulationConditionalBranch = new ConditionalBranch();
       initialSolutionsCreator = new SolutionsCreator();
       Assigner initialPopulationSizeAssigner = new Assigner();
+      Comparator maxIterationsComparator = new Comparator();
+      ConditionalBranch terminationConditionalBranch1 = new ConditionalBranch();
       IntCounter iterationCounter = new IntCounter();
       UniformSubScopesProcessor matchCondtionSubScopesProcessor = new UniformSubScopesProcessor();
@@ -159 +179 @@
       variableCreator.CollectedValues.Add(new ValueParameter<IntValue>("CurrentPopulationSize", new IntValue(0)));
 
+      resultsCollector.CollectedValues.Add(new LookupParameter<IntValue>("Iteration"));
+      resultsCollector.ResultsParameter.ActualName = "Results";
+
+      finalAnalyzer.Name = "Analyzer";
+      finalAnalyzer.OperatorParameter.ActualName = "Analyzer";
+
       initialPopulationConditionalBranch.ConditionParameter.ActualName = "CreateInitialPopulation";
 
@@ -165 +191 @@
       initialPopulationSizeAssigner.LeftSideParameter.ActualName = "CurrentPopulationSize";
       initialPopulationSizeAssigner.RightSideParameter.ActualName = "N";
+
+      maxIterationsComparator.Comparison = new Comparison(ComparisonType.GreaterOrEqual);
+      maxIterationsComparator.LeftSideParameter.ActualName = "Iteration";
+      maxIterationsComparator.RightSideParameter.ActualName = MaxIterationsParameter.ActualName;
+      maxIterationsComparator.ResultParameter.ActualName = "TerminateMaxIterations";
+
+      terminationConditionalBranch1.ConditionParameter.ActualName = "TerminateMaxIterations";
 
       iterationCounter.ValueParameter.ActualName = "Iteration";
@@ -311 +344 @@
       OperatorGraph.InitialOperator = variableCreator;
 
-      variableCreator.Successor = initialPopulationConditionalBranch;
+      variableCreator.Successor = resultsCollector;
+      resultsCollector.Successor = initialPopulationConditionalBranch;
       initialPopulationConditionalBranch.TrueBranch = initialSolutionsCreator;
       initialSolutionsCreator.Successor = initialPopulationSizeAssigner;
       initialPopulationConditionalBranch.FalseBranch = new EmptyOperator();
-      initialPopulationConditionalBranch.Successor = classifierFetcher;
+      initialPopulationConditionalBranch.Successor = maxIterationsComparator;
+      maxIterationsComparator.Successor = terminationConditionalBranch1;
+      terminationConditionalBranch1.TrueBranch = finalAnalyzer;
+      terminationConditionalBranch1.FalseBranch = classifierFetcher;
       classifierFetcher.Successor = matchCondtionSubScopesProcessor;
       matchCondtionSubScopesProcessor.Operator = matchConditionOperator;
@@ -371 +408 @@
       deletionSelectorAfterGA.Successor = leftReducerAfterGA;
       leftReducerAfterGA.Successor = iterationCounter;
-      iterationCounter.Successor = classifierFetcher;
+      //iterationCounter.Successor = maxIterationsComparator;
+
+      iterationCounter.Successor = testReducer;
+      testReducer.Successor = maxIterationsComparator;
       #endregion
     }

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

@@ -83 +83 @@
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="HeuristicLab.Collections-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL" />
-    <Reference Include="HeuristicLab.Common-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL" />
-    <Reference Include="HeuristicLab.Core-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL" />
-    <Reference Include="HeuristicLab.Data-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL" />
-    <Reference Include="HeuristicLab.Encodings.IntegerVectorEncoding-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL" />
-    <Reference Include="HeuristicLab.Operators-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL" />
-    <Reference Include="HeuristicLab.Optimization-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" />
-    <Reference Include="HeuristicLab.Persistence-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL" />
-    <Reference Include="HeuristicLab.PluginInfrastructure-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>
+    </Reference>
+    <Reference Include="HeuristicLab.Common-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="HeuristicLab.Core-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="HeuristicLab.Data-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="HeuristicLab.Encodings.IntegerVectorEncoding-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="HeuristicLab.Operators-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="HeuristicLab.Optimization-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="HeuristicLab.Parameters-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="HeuristicLab.Persistence-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="HeuristicLab.PluginInfrastructure-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
+      <Private>False</Private>
+    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
@@ -132 +152 @@
       <Project>{422FB262-0845-4969-8D16-12F057AA90B1}</Project>
       <Name>HeuristicLab.Encodings.ConditionActionEncoding-3.3</Name>
+      <Private>False</Private>
     </ProjectReference>
   </ItemGroup>

branches/LearningClassifierSystems/HeuristicLab.Encodings.CombinedIntegerVectorEncoding/3.3/Manipulator/UniformSomePositionManipulator.cs

@@ -46 +46 @@
     public UniformSomePositionManipulator()
       : base() {
-      Parameters.Add(new ValueLookupParameter<PercentValue>("Probability", "The probability for each dimension to be manipulated.", new PercentValue(0.5)));
+      Parameters.Add(new ValueLookupParameter<PercentValue>("Probability", "The probability for each dimension to be manipulated."));
       Parameters.Add(new LookupParameter<IItemSet<CombinedIntegerVector>>("PossibleActions"));
     }

branches/LearningClassifierSystems/HeuristicLab.Encodings.ConditionActionEncoding/3.3/Deletion/XCSDeletionOperator.cs

@@ -112 +112 @@
         double averageFitnessInPopulation = fitnessSum / numerositySum;
         for (int cl = 0; cl < fitnesses.Length; cl++) {
-          if (numerosities[cl].Value > 0) {
+          if (numerosities[cl].Value > 0 && !hasToBeDeleted[cl].Value) {
             voteSum += DeletionVote(averageFitnessInPopulation, averageActionSetSizes[cl].Value, numerosities[cl].Value, fitnesses[cl].Value, experiences[cl].Value);
           }

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

@@ -65 +65 @@
       <Private>False</Private>
     </Reference>
-    <Reference Include="HeuristicLab.Problems.DataAnalysis-3.4, Version=3.4.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL" />
+    <Reference Include="HeuristicLab.Problems.DataAnalysis-3.4, Version=3.4.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
+      <Private>False</Private>
+    </Reference>
     <Reference Include="HeuristicLab.Selection-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
       <Private>False</Private>
@@ -83 +85 @@
     <Compile Include="ActionSelection\MaxValueActionSelector.cs" />
     <Compile Include="ActionSelection\RandomActionSelector.cs" />
+    <Compile Include="Analyzer\XCSSolutionAnalyzer.cs" />
     <Compile Include="Covering\CoveringOperator.cs" />
     <Compile Include="Covering\DoDeletionBeforeCovering.cs" />
@@ -95 +98 @@
     <Compile Include="GA\XCSAfterCrossoverOperator.cs" />
     <Compile Include="IClassifier.cs" />
+    <Compile Include="Interfaces\IConditionActionModel.cs" />
     <Compile Include="Interfaces\IConditionActionProblem.cs" />
     <Compile Include="Interfaces\IConditionActionProblemData.cs" />
+    <Compile Include="Interfaces\IConditionActionSolution.cs" />
+    <Compile Include="Interfaces\IXCSModel.cs" />
+    <Compile Include="Interfaces\IXCSSolution.cs" />
     <Compile Include="Operator\CalculateAccuracy.cs" />
     <Compile Include="GA\XCSCheckIfGAShouldBeApplied.cs" />
@@ -108 +115 @@
     <Compile Include="Plugin.cs" />
     <Compile Include="Reinforcement\ActionExecuter.cs" />
+    <Compile Include="Reinforcement\ClassifierFetcher.cs" />
     <Compile Include="Reinforcement\IActionExecuter.cs" />
     <Compile Include="Reinforcement\IClassifierFetcher.cs" />
@@ -116 +124 @@
     <Compile Include="Subsumption\ExecuteGASubsumptionOperator.cs" />
     <Compile Include="Subsumption\IActionSetSubsumption.cs" />
+    <Compile Include="XCSClassifier.cs" />
+    <Compile Include="XCSModel.cs" />
+    <Compile Include="XCSSolution.cs" />
     <None Include="Properties\AssemblyInfo.cs.frame" />
   </ItemGroup>

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

@@ -20 +20 @@
 #endregion
 
+using System;
 using System.Collections.Generic;
 using HeuristicLab.Core;
@@ -32 +33 @@
     IEnumerable<string> AllowedConditionVariables { get; }
     IEnumerable<string> AllowedActionVariables { get; }
+
+    IntValue Length { get; }
+    IntValue ActionLength { get; }
+    IntMatrix Bounds { get; }
+
+    IClassifier FetchClassifier(int rowNumber);
+
+    event EventHandler Changed;
   }
 }

branches/LearningClassifierSystems/HeuristicLab.Problems.ConditionActionClassification/3.3/HeuristicLab.Problems.ConditionActionClassification-3.3.csproj

@@ -40 +40 @@
     <Reference Include="HeuristicLab.Collections-3.3">
       <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Collections-3.3.dll</HintPath>
+      <Private>False</Private>
     </Reference>
     <Reference Include="HeuristicLab.Common-3.3">
       <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Common-3.3.dll</HintPath>
+      <Private>False</Private>
     </Reference>
     <Reference Include="HeuristicLab.Core-3.3">
       <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Core-3.3.dll</HintPath>
+      <Private>False</Private>
     </Reference>
     <Reference Include="HeuristicLab.Data-3.3">
       <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Data-3.3.dll</HintPath>
+      <Private>False</Private>
     </Reference>
-    <Reference Include="HeuristicLab.Encodings.IntegerVectorEncoding-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL" />
-    <Reference Include="HeuristicLab.Operators-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL" />
-    <Reference Include="HeuristicLab.Optimization-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL" />
+    <Reference Include="HeuristicLab.Encodings.IntegerVectorEncoding-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="HeuristicLab.Operators-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="HeuristicLab.Optimization-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
+      <Private>False</Private>
+    </Reference>
     <Reference Include="HeuristicLab.Parameters-3.3">
       <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Parameters-3.3.dll</HintPath>
+      <Private>False</Private>
     </Reference>
     <Reference Include="HeuristicLab.Persistence-3.3">
       <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Persistence-3.3.dll</HintPath>
+      <Private>False</Private>
     </Reference>
     <Reference Include="HeuristicLab.PluginInfrastructure-3.3">
       <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.PluginInfrastructure-3.3.dll</HintPath>
+      <Private>False</Private>
     </Reference>
-    <Reference Include="HeuristicLab.Problems.DataAnalysis-3.4, Version=3.4.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL" />
+    <Reference Include="HeuristicLab.Problems.DataAnalysis-3.4, Version=3.4.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
+      <Private>False</Private>
+    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
@@ -76 +91 @@
     <Compile Include="Implementation\ConditionActionClassificationProblemData.cs" />
     <Compile Include="Plugin.cs" />
-    <Compile Include="Reinforcement\CombinedIntegerVectorClassifierFetcher.cs" />
     <None Include="HeuristicLab.snk" />
     <None Include="Properties\AssemblyInfo.cs.frame" />
@@ -88 +102 @@
       <Project>{CE7163C5-BFFE-45F0-9BD0-E10EF24E8BD2}</Project>
       <Name>HeuristicLab.Encodings.CombinedIntegerVectorEncoding-3.3</Name>
+      <Private>False</Private>
     </ProjectReference>
     <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>
+      <Private>False</Private>
     </ProjectReference>
   </ItemGroup>

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

@@ -76 +76 @@
       get { return (IFixedValueParameter<IntValue>)Parameters["ThetaMinimalNumberOfActions"]; }
     }
-    //for test purposes
-    public IFixedValueParameter<IntValue> LengthParameter {
-      get { return (IFixedValueParameter<IntValue>)Parameters["Length"]; }
-    }
-    public IFixedValueParameter<IntValue> ActionPartLengthParameter {
-      get { return (IFixedValueParameter<IntValue>)Parameters["ActionPartLength"]; }
-    }
-    public IFixedValueParameter<IntMatrix> BoundsParameter {
-      get { return (IFixedValueParameter<IntMatrix>)Parameters["Bounds"]; }
-    }
     #endregion
 
@@ -120 +110 @@
     }
     IParameter IConditionActionProblem.ActionExecuterParameter { get { return ActionExecuterParameter; } }
-    public CombinedIntegerVectorClassifierFetcher ClassifierFetcher {
+    public ClassifierFetcher ClassifierFetcher {
       get { return ClassifierFetcherParameter.Value; }
     }
-    public ValueParameter<CombinedIntegerVectorClassifierFetcher> ClassifierFetcherParameter {
-      get { return (ValueParameter<CombinedIntegerVectorClassifierFetcher>)Parameters[ClassifierFetcherParameterName]; }
+    public ValueParameter<ClassifierFetcher> ClassifierFetcherParameter {
+      get { return (ValueParameter<ClassifierFetcher>)Parameters[ClassifierFetcherParameterName]; }
     }
     IClassifierFetcher IConditionActionProblem.ClassifierFetcher { get { return ClassifierFetcher; } }
@@ -150 +140 @@
     IParameter IConditionActionProblem.CoveringSolutionCreatorParameter {
       get { return CoveringSolutionCreatorParameter; }
+    }
+    private XCSSolutionAnalyzer XCSSolutionAnalyzer {
+      get { return Operators.OfType<XCSSolutionAnalyzer>().FirstOrDefault(); }
     }
     #endregion
@@ -170 +163 @@
     public ConditionActionClassificationProblem(ConditionActionClassificationProblemData problemData, XCSEvaluator evaluator, UniformRandomCombinedIntegerVectorCreator solutionCreator, ICoveringSolutionCreator coveringSolutionCreator)
       : base(evaluator, solutionCreator) {
-      Parameters.Add(new FixedValueParameter<IntValue>("Length", "The operator to create a solution.", new IntValue(7)));
-      Parameters.Add(new FixedValueParameter<IntValue>("ActionPartLength", "The operator to create a solution.", new IntValue(1)));
-      int[,] elements = new int[,] { { 0, 3 }, { 0, 3 }, { 0, 3 }, { 0, 3 }, { 0, 3 }, { 0, 3 }, { 0, 2 } };
-      Parameters.Add(new FixedValueParameter<IntMatrix>("Bounds", "The operator to create a solution.", new IntMatrix(elements)));
       Parameters.Add(new ValueParameter<ConditionActionClassificationProblemData>("ProblemData", "", problemData));
       Parameters.Add(new FixedValueParameter<DoubleValue>("PositiveReward", "", new DoubleValue(1000)));
@@ -182 +171 @@
 
       Parameters.Add(new ValueParameter<IActionExecuter>(ActionExecuterParameterName, "", new ActionExecuter()));
-      Parameters.Add(new ValueParameter<CombinedIntegerVectorClassifierFetcher>(ClassifierFetcherParameterName, "", new CombinedIntegerVectorClassifierFetcher()));
+      Parameters.Add(new ValueParameter<ClassifierFetcher>(ClassifierFetcherParameterName, "", new ClassifierFetcher()));
       Parameters.Add(new FixedValueParameter<ItemSet<IClassifier>>("PossibleActions"));
       Parameters.Add(new FixedValueParameter<ItemSet<CombinedIntegerVector>>("PossibleActionsConcreteClass"));
@@ -196 +185 @@
       Evaluator.InitialPredictionParameter.ActualName = "InitialPrediction";
 
-      SolutionCreator.ActionPartLengthParameter.ActualName = ActionPartLengthParameter.Name;
-      SolutionCreator.LengthParameter.ActualName = LengthParameter.Name;
-      SolutionCreator.BoundsParameter.ActualName = BoundsParameter.Name;
+      SolutionCreator.ActionPartLengthParameter.ActualName = ProblemData.ActionLengthParameter.Name;
+      SolutionCreator.LengthParameter.ActualName = ProblemData.LengthParameter.Name;
+      SolutionCreator.BoundsParameter.ActualName = ProblemData.BoundsParameter.Name;
 
       coveringSolutionCreator.ChangeSymbolProbabilityParameter.ActualName = ChangeSymbolProbabilityInCoveringParameter.Name;
@@ -204 +193 @@
       coveringSolutionCreator.CreatedClassifierParameter.ActualName = "CombinedIntegerVector";
 
-      ClassifierFetcher.ActionPartLengthParameter.ActualName = ActionPartLengthParameter.Name;
-      ClassifierFetcher.BoundsParameter.ActualName = BoundsParameter.Name;
       ClassifierFetcher.ProblemDataParameter.ActualName = ProblemDataParameter.Name;
 
@@ -217 +204 @@
       ThetaMinimalNumberOfActions.Value = PossibleActions.Count;
 
-      BoundsParameter.ValueChanged += new System.EventHandler(BoundsParameter_ValueChanged);
-      LengthParameter.ValueChanged += new System.EventHandler(LengthParameter_ValueChanged);
-      ActionPartLengthParameter.ValueChanged += new System.EventHandler(ActionPartLengthParameter_ValueChanged);
-    }
-
-    #region event handler
-    private void ActionPartLengthParameter_ValueChanged(object sender, System.EventArgs e) {
+      InitializeOperators();
+
+      problemData.Changed += new System.EventHandler(problemData_Changed);
+    }
+
+    private void problemData_Changed(object sender, System.EventArgs e) {
       SetPossibleActions();
     }
-    private void LengthParameter_ValueChanged(object sender, System.EventArgs e) {
-      SetPossibleActions();
-    }
-    private void BoundsParameter_ValueChanged(object sender, System.EventArgs e) {
-      SetPossibleActions();
-    }
-    #endregion
+
+    private void InitializeOperators() {
+      Operators.Add(new XCSSolutionAnalyzer());
+
+      ParameterizeAnalyzers();
+    }
+
+    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";
+      }
+    }
 
     private void SetPossibleActions() {
       //get bounds of action
-      IntMatrix actionBounds = GetElementsOfBoundsForAction(BoundsParameter.Value, LengthParameter.Value.Value, ActionPartLengthParameter.Value.Value);
-      int actionLength = ActionPartLengthParameter.Value.Value;
-      int start = LengthParameter.Value.Value - actionLength;
+      IntMatrix actionBounds = GetElementsOfBoundsForAction(ProblemData.Bounds, ProblemData.Length.Value, ProblemData.ActionLength.Value);
+      int actionLength = ProblemData.ActionLength.Value;
+      int start = ProblemData.Length.Value - actionLength;
       int[] elements = new int[actionLength];
       int[] curPos = new int[actionLength];

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

@@ -26 +26 @@
 using HeuristicLab.Core;
 using HeuristicLab.Data;
+using HeuristicLab.Encodings.CombinedIntegerVectorEncoding;
 using HeuristicLab.Encodings.ConditionActionEncoding;
 using HeuristicLab.Parameters;
@@ -54 +55 @@
       get { return (IFixedValueParameter<ReadOnlyCheckedItemList<StringValue>>)Parameters["ActionVariables"]; }
     }
+    public IFixedValueParameter<IntValue> LengthParameter {
+      get { return (IFixedValueParameter<IntValue>)Parameters["Length"]; }
+    }
+    public IFixedValueParameter<IntValue> ActionLengthParameter {
+      get { return (IFixedValueParameter<IntValue>)Parameters["ActionLength"]; }
+    }
+    public IFixedValueParameter<IntMatrix> BoundsParameter {
+      get { return (IFixedValueParameter<IntMatrix>)Parameters["Bounds"]; }
+    }
     #endregion
 
@@ -74 +84 @@
       get { return ActionVariables.CheckedItems.Select(x => x.Value.Value); }
     }
+
+    private IDictionary<int, IClassifier> fetchClassifiersCache = new Dictionary<int, IClassifier>();
 
 
@@ -105 +117 @@
       Parameters.Add(new FixedValueParameter<ReadOnlyCheckedItemList<StringValue>>("ActionVariables", "", actionVariables.AsReadOnly()));
       Parameters.Add(new FixedValueParameter<ReadOnlyCheckedItemList<StringValue>>("ConditionVariables", "", conditionVariables.AsReadOnly()));
+      Parameters.Add(new FixedValueParameter<IntValue>("Length", "", new IntValue(7)));
+      Parameters.Add(new FixedValueParameter<IntValue>("ActionLength", "", new IntValue(1)));
+      int[,] elements = new int[,] { { 0, 3 }, { 0, 3 }, { 0, 3 }, { 0, 3 }, { 0, 3 }, { 0, 3 }, { 0, 2 } };
+      Parameters.Add(new FixedValueParameter<IntMatrix>("Bounds", "", new IntMatrix(elements)));
 
       ((ValueParameter<Dataset>)DatasetParameter).ReactOnValueToStringChangedAndValueItemImageChanged = false;
     }
+
+    public event EventHandler Changed;
+    protected virtual void OnChanged() {
+      var listeners = Changed;
+      if (listeners != null) listeners(this, EventArgs.Empty);
+    }
+
+    public IntValue Length {
+      get { return LengthParameter.Value; }
+    }
+
+    public IntValue ActionLength {
+      get { return ActionLengthParameter.Value; }
+    }
+
+    public IntMatrix Bounds {
+      get { return BoundsParameter.Value; }
+    }
+
+    public IClassifier FetchClassifier(int rowNumber) {
+      if (!fetchClassifiersCache.ContainsKey(rowNumber)) {
+        int[] elements = new int[Length.Value];
+        var variableNamesList = Dataset.VariableNames.ToList();
+        int elementIndex = 0;
+        for (int i = 0; i < variableNamesList.Count; i++) {
+          if (AllowedConditionVariables.Contains(variableNamesList[i])) {
+            elements[elementIndex] = int.Parse(Dataset.GetValue(rowNumber, i));
+            elementIndex++;
+          }
+        }
+        for (int i = 0; i < variableNamesList.Count; i++) {
+          if (AllowedActionVariables.Contains(variableNamesList[i])) {
+            elements[elementIndex] = int.Parse(Dataset.GetValue(rowNumber, i));
+            elementIndex++;
+          }
+        }
+        if (elementIndex != Length.Value) {
+          throw new ArgumentException("Length of classifier is not equal to the number of allowed condition + action variables.");
+        }
+        fetchClassifiersCache.Add(rowNumber, new CombinedIntegerVector(elements, ActionLengthParameter.Value.Value, BoundsParameter.Value));
+      }
+      return fetchClassifiersCache[rowNumber];
+    }
   }
 }

branches/LearningClassifierSystems/LearningClassifierSystem.sln

@@ -15 +15 @@
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Problems.ConditionActionClassification-3.3", "HeuristicLab.Problems.ConditionActionClassification\3.3\HeuristicLab.Problems.ConditionActionClassification-3.3.csproj", "{EA51D441-F6A3-41E1-9993-A2488E93C222}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Problems.XCS.Views-3.3", "HeuristicLab.Problems.XCS.Views\3.3\HeuristicLab.Problems.XCS.Views-3.3.csproj", "{8FFB8E0F-BC17-4D72-AF0F-E67A22F8EDE5}"
 EndProject
 Global
@@ -62 +64 @@
     {EA51D441-F6A3-41E1-9993-A2488E93C222}.Release|x64.ActiveCfg = Release|Any CPU
     {EA51D441-F6A3-41E1-9993-A2488E93C222}.Release|x86.ActiveCfg = Release|Any CPU
+    {8FFB8E0F-BC17-4D72-AF0F-E67A22F8EDE5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+    {8FFB8E0F-BC17-4D72-AF0F-E67A22F8EDE5}.Debug|Any CPU.Build.0 = Debug|Any CPU
+    {8FFB8E0F-BC17-4D72-AF0F-E67A22F8EDE5}.Debug|x64.ActiveCfg = Debug|Any CPU
+    {8FFB8E0F-BC17-4D72-AF0F-E67A22F8EDE5}.Debug|x86.ActiveCfg = Debug|Any CPU
+    {8FFB8E0F-BC17-4D72-AF0F-E67A22F8EDE5}.Release|Any CPU.ActiveCfg = Release|Any CPU
+    {8FFB8E0F-BC17-4D72-AF0F-E67A22F8EDE5}.Release|Any CPU.Build.0 = Release|Any CPU
+    {8FFB8E0F-BC17-4D72-AF0F-E67A22F8EDE5}.Release|x64.ActiveCfg = Release|Any CPU
+    {8FFB8E0F-BC17-4D72-AF0F-E67A22F8EDE5}.Release|x86.ActiveCfg = Release|Any CPU
   EndGlobalSection
   GlobalSection(SolutionProperties) = preSolution