Changeset 9160 for branches/LearningClassifierSystems

Timestamp:

01/15/13 10:47:09 (12 years ago)

Author:

sforsten

Message:

#1980:

• added problem instance provider to import csv files for ConditionActionClassificationProblemData
• adapted LCSAdaptedGeneticAlgorithm to use the crossover probability
• fixed a bug in XCSModelView

Location:

branches/LearningClassifierSystems

Files:

• HeuristicLab.Algorithms.LearningClassifierSystems/3.3/HeuristicLab.Algorithms.LearningClassifierSystems-3.3.csproj (modified) (1 diff)
• HeuristicLab.Algorithms.LearningClassifierSystems/3.3/LCSAdaptedGeneticAlgorithm.cs (modified) (5 diffs)
• HeuristicLab.Encodings.ConditionActionEncoding/3.3/HeuristicLab.Encodings.ConditionActionEncoding-3.3.csproj (modified) (2 diffs)
• HeuristicLab.Encodings.ConditionActionEncoding/3.3/Interfaces/IConditionActionProblemData.cs (modified) (1 diff)
• HeuristicLab.Encodings.ConditionActionEncoding/3.3/Selectors/PreservingRightReducer.cs (added)
• HeuristicLab.Problems.ConditionActionClassification/3.3 (modified) (1 prop)
• HeuristicLab.Problems.ConditionActionClassification/3.3/HeuristicLab.Problems.ConditionActionClassification-3.3.csproj (modified) (1 diff)
• HeuristicLab.Problems.ConditionActionClassification/3.3/Implementation/ConditionActionClassificationProblem.cs (modified) (4 diffs)
• HeuristicLab.Problems.ConditionActionClassification/3.3/Implementation/ConditionActionClassificationProblemData.cs (modified) (2 diffs)
• HeuristicLab.Problems.Instances.ConditionActionClassification (added)
• HeuristicLab.Problems.Instances.ConditionActionClassification/3.3 (added)
• HeuristicLab.Problems.Instances.ConditionActionClassification/3.3/ConditionActionCVSInstanceProvider.cs (added)
• HeuristicLab.Problems.Instances.ConditionActionClassification/3.3/ConditionActionInstanceProvider.cs (added)
• HeuristicLab.Problems.Instances.ConditionActionClassification/3.3/HeuristicLab.Problems.Instances.ConditionActionClassification.csproj (added)
• HeuristicLab.Problems.Instances.ConditionActionClassification/3.3/HeuristicLab.snk (added)
• HeuristicLab.Problems.Instances.ConditionActionClassification/3.3/Plugin.cs.frame (added)
• HeuristicLab.Problems.Instances.ConditionActionClassification/3.3/Properties (added)
• HeuristicLab.Problems.Instances.ConditionActionClassification/3.3/Properties/AssemblyInfo.cs.frame (added)
• HeuristicLab.Problems.XCS.Views/3.3 (modified) (1 prop)
• HeuristicLab.Problems.XCS.Views/3.3/Properties (modified) (1 prop)
• HeuristicLab.Problems.XCS.Views/3.3/XCSModelView.cs (modified) (1 diff)
• LearningClassifierSystem.sln (modified) (2 diffs)

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

@@ -87 +87 @@
       <Private>False</Private>
     </Reference>
+    <Reference Include="HeuristicLab.Problems.Instances-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL" />
     <Reference Include="HeuristicLab.Random-3.3">
       <HintPath>..\..\..\trunk\sources\bin\HeuristicLab.Random-3.3.dll</HintPath>

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

@@ -63 +63 @@
       get { return (ValueLookupParameter<PercentValue>)Parameters["MutationProbability"]; }
     }
+    public ValueLookupParameter<PercentValue> CrossoverProbabilityParameter {
+      get { return (ValueLookupParameter<PercentValue>)Parameters["CrossoverProbability"]; }
+    }
     public ValueLookupParameter<IOperator> MutatorParameter {
       get { return (ValueLookupParameter<IOperator>)Parameters["Mutator"]; }
@@ -111 +114 @@
       Parameters.Add(new ValueLookupParameter<IOperator>("Crossover", "The operator used to cross solutions."));
       Parameters.Add(new ValueLookupParameter<IOperator>("AfterCrossover", "The operator executed after crossing the solutions."));
-      Parameters.Add(new ValueLookupParameter<PercentValue>("MutationProbability", "The probability that the mutation operator is applied on a solution."));
+      Parameters.Add(new ValueLookupParameter<PercentValue>("CrossoverProbability", "The probability that the crossover operator is applied on a solution."));
+      Parameters.Add(new ValueLookupParameter<PercentValue>("MutationProbability", "The probability that druing the mutation operator a mutation takes place."));
       Parameters.Add(new ValueLookupParameter<IOperator>("Mutator", "The operator used to mutate solutions."));
       Parameters.Add(new ValueLookupParameter<IntValue>("MaximumGenerations", "The maximum number of generations which should be processed."));
@@ -128 +132 @@
       ChildrenCreator childrenCreator = new ChildrenCreator();
       UniformSubScopesProcessor uniformSubScopesProcessor1 = new UniformSubScopesProcessor();
+      StochasticBranch crossoverStochasticBranch = new StochasticBranch();
+      RandomSelector randomSelector = new RandomSelector();
+      PreservingRightReducer preservingRightReducer = new PreservingRightReducer();
+      Assigner numerosityAssigner = new Assigner();
+      Assigner experienceAssigner = new Assigner();
       Placeholder crossover = new Placeholder();
       Placeholder afterCrossover = new Placeholder();
@@ -167 +176 @@
       childrenCreator.ParentsPerChild = new IntValue(2);
 
+      crossoverStochasticBranch.ProbabilityParameter.ActualName = CrossoverProbabilityParameter.ActualName;
+      crossoverStochasticBranch.RandomParameter.ActualName = "Random";
+
+      randomSelector.CopySelected.Value = true;
+      randomSelector.NumberOfSelectedSubScopesParameter.Value = new IntValue(1);
+
       crossover.Name = "Crossover";
       crossover.OperatorParameter.ActualName = "Crossover";
+
+      numerosityAssigner.LeftSideParameter.ActualName = "Numerosity";
+      numerosityAssigner.RightSideParameter.Value = new IntValue(1);
+
+      experienceAssigner.LeftSideParameter.ActualName = "Experience";
+      experienceAssigner.RightSideParameter.Value = new IntValue(0);
 
       afterCrossover.Name = "AfterCrossover";
@@ -228 +249 @@
       subScopesProcessor1.Successor = mergingReducer;
       childrenCreator.Successor = uniformSubScopesProcessor1;
-      uniformSubScopesProcessor1.Operator = crossover;
+      uniformSubScopesProcessor1.Operator = crossoverStochasticBranch;
       uniformSubScopesProcessor1.Successor = subScopesCounter;
+      crossoverStochasticBranch.FirstBranch = crossover;
+      crossoverStochasticBranch.SecondBranch = randomSelector;
+      randomSelector.Successor = preservingRightReducer;
+      preservingRightReducer.Successor = numerosityAssigner;
+      numerosityAssigner.Successor = experienceAssigner;
+      experienceAssigner.Successor = null;
+      crossoverStochasticBranch.Successor = mutator;
       crossover.Successor = afterCrossover;
-      afterCrossover.Successor = mutator;
       mutator.Successor = doGASubsumptionBranch1;
       doGASubsumptionBranch1.TrueBranch = checkGASubsumptionOperator;

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

@@ -68 +68 @@
       <Private>False</Private>
     </Reference>
+    <Reference Include="HeuristicLab.Problems.Instances-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>
@@ -120 +121 @@
     <Compile Include="Selectors\IMatchSelector.cs" />
     <Compile Include="Selectors\MatchSelector.cs" />
+    <Compile Include="Selectors\PreservingRightReducer.cs" />
     <Compile Include="Subsumption\ActionSetSubsumptionOperator.cs" />
     <Compile Include="Subsumption\CheckGASubsumptionOperator.cs" />

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

@@ -34 +34 @@
     IEnumerable<string> AllowedActionVariables { get; }
 
-    IntValue Length { get; }
-    IntValue ActionLength { get; }
-    IntMatrix Bounds { get; }
-
     IClassifier FetchClassifier(int rowNumber);
 

branches/LearningClassifierSystems/HeuristicLab.Problems.ConditionActionClassification/3.3

@@ -1 +1 @@
 obj
 Plugin.cs
+*.user

@@ -1 +1 @@
 obj
 Plugin.cs
+*.user

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

@@ -78 +78 @@
       <Private>False</Private>
     </Reference>
+    <Reference Include="HeuristicLab.Problems.Instances-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL" />
     <Reference Include="System" />
     <Reference Include="System.Core" />

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

@@ -30 +30 @@
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 using HeuristicLab.Problems.DataAnalysis;
+using HeuristicLab.Problems.Instances;
 
 namespace HeuristicLab.Problems.ConditionActionClassification {
   [StorableClass]
-  public class ConditionActionClassificationProblem : HeuristicOptimizationProblem<XCSEvaluator, UniformRandomCombinedIntegerVectorCreator>, IConditionActionProblem {
+  public class ConditionActionClassificationProblem : HeuristicOptimizationProblem<XCSEvaluator, UniformRandomCombinedIntegerVectorCreator>, IConditionActionProblem,
+  IProblemInstanceConsumer<ConditionActionClassificationProblemData> {
     private const string ClassifierFetcherParameterName = "ClassifierFetcher";
     private const string ActionExecuterParameterName = "ActionExecuter";
@@ -87 +89 @@
     public ConditionActionClassificationProblemData ProblemData {
       get { return ProblemDataParameter.Value; }
+      protected set {
+        ProblemDataParameter.Value = value;
+        if (value != null) {
+          SetProblemDataSpecificParameters();
+        }
+      }
     }
     IParameter IConditionActionProblem.PossibleActionsConcreteClassParameter {
@@ -185 +193 @@
       Evaluator.InitialPredictionParameter.ActualName = "InitialPrediction";
 
+      coveringSolutionCreator.ChangeSymbolProbabilityParameter.ActualName = ChangeSymbolProbabilityInCoveringParameter.Name;
+      coveringSolutionCreator.CoverClassifierParameter.ActualName = ClassifierFetcher.CurrentClassifierToMatchParameter.ActualName;
+      coveringSolutionCreator.CreatedClassifierParameter.ActualName = "CombinedIntegerVector";
+
+      ClassifierFetcher.ProblemDataParameter.ActualName = ProblemDataParameter.Name;
+
+      ActionExecuter.CurrentClassifierToMatchParameter.ActualName = ClassifierFetcher.CurrentClassifierToMatchParameter.ActualName;
+      ActionExecuter.NegativeRewardParameter.ActualName = NegativeRewardParameter.Name;
+      ActionExecuter.PositiveRewardParameter.ActualName = PositiveRewardParameter.Name;
+
+      ActionSetSubsumptionOperator.ClassifiersParameter.ActualName = "CombinedIntegerVector";
+
+      SetProblemDataSpecificParameters();
+      ThetaMinimalNumberOfActions.Value = PossibleActions.Count;
+
+      InitializeOperators();
+
+      problemData.Changed += new System.EventHandler(problemData_Changed);
+    }
+
+    private void problemData_Changed(object sender, System.EventArgs e) {
+      SetProblemDataSpecificParameters();
+    }
+
+    private void SetProblemDataSpecificParameters() {
       SolutionCreator.ActionPartLengthParameter.ActualName = ProblemData.ActionLengthParameter.Name;
       SolutionCreator.LengthParameter.ActualName = ProblemData.LengthParameter.Name;
       SolutionCreator.BoundsParameter.ActualName = ProblemData.BoundsParameter.Name;
 
-      coveringSolutionCreator.ChangeSymbolProbabilityParameter.ActualName = ChangeSymbolProbabilityInCoveringParameter.Name;
-      coveringSolutionCreator.CoverClassifierParameter.ActualName = ClassifierFetcher.CurrentClassifierToMatchParameter.ActualName;
-      coveringSolutionCreator.CreatedClassifierParameter.ActualName = "CombinedIntegerVector";
-
-      ClassifierFetcher.ProblemDataParameter.ActualName = ProblemDataParameter.Name;
-
-      ActionExecuter.CurrentClassifierToMatchParameter.ActualName = ClassifierFetcher.CurrentClassifierToMatchParameter.ActualName;
-      ActionExecuter.NegativeRewardParameter.ActualName = NegativeRewardParameter.Name;
-      ActionExecuter.PositiveRewardParameter.ActualName = PositiveRewardParameter.Name;
-
-      ActionSetSubsumptionOperator.ClassifiersParameter.ActualName = "CombinedIntegerVector";
-
-      SetPossibleActions();
-      ThetaMinimalNumberOfActions.Value = PossibleActions.Count;
-
-      InitializeOperators();
-
-      problemData.Changed += new System.EventHandler(problemData_Changed);
-    }
-
-    private void problemData_Changed(object sender, System.EventArgs e) {
       SetPossibleActions();
     }
@@ -282 +294 @@
       return actionBounds;
     }
+
+    public void Load(ConditionActionClassificationProblemData data) {
+      Name = data.Name;
+      Description = data.Description;
+      ProblemData = data;
+    }
   }
 }

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

@@ -40 +40 @@
       {0,0,1,1,0,0,0},
       {0,1,1,1,0,0,0},
-      {0,0,1,0,0,0,0},
+      {0,0,1,0,0,0,1},
       {1,0,1,0,1,1,0}
     };
@@ -117 +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)));
+      Parameters.Add(new FixedValueParameter<IntValue>("Length", "", new IntValue(allowedConditionVariables.Count() + allowedActionVariables.Count())));
+      Parameters.Add(new FixedValueParameter<IntValue>("ActionLength", "", new IntValue(allowedActionVariables.Count())));
+      Parameters.Add(new FixedValueParameter<IntMatrix>("Bounds", "", GetBoundsMatrix(dataset, allowedConditionVariables, allowedActionVariables)));
 
       ((ValueParameter<Dataset>)DatasetParameter).ReactOnValueToStringChangedAndValueItemImageChanged = false;
+    }
+
+    private IntMatrix GetBoundsMatrix(Dataset dataset, IEnumerable<string> conditionVariables, IEnumerable<string> actionVariables) {
+      IntMatrix bounds = new IntMatrix(conditionVariables.Count() + actionVariables.Count(), 2);
+      int index = 0;
+      foreach (var variable in conditionVariables) {
+        var values = dataset.GetDoubleValues(variable);
+        bounds[index, 0] = (int)values.Min();
+        bounds[index, 1] = (int)values.Max() + 2;
+        index++;
+      }
+      foreach (var variable in actionVariables) {
+        var values = dataset.GetDoubleValues(variable);
+        bounds[index, 0] = (int)values.Min();
+        bounds[index, 1] = (int)values.Max() + 1;
+        index++;
+      }
+      return bounds;
     }
 

branches/LearningClassifierSystems/HeuristicLab.Problems.XCS.Views/3.3/XCSModelView.cs

@@ -52 +52 @@
         if (Content == null) {
           dataGridView.Rows.Clear();
+        } else {
+
+          dataGridView.RowCount = Content.Count;
+
+          int row = 0;
+          foreach (var xcsClassifier in Content) {
+            dataGridView[0, row].Value = xcsClassifier.Classifier.ToString();
+            dataGridView[1, row].Value = xcsClassifier.Prediction.ToString();
+            dataGridView[2, row].Value = xcsClassifier.PredictionError.ToString();
+            dataGridView[3, row].Value = xcsClassifier.Fitness.ToString();
+            dataGridView[4, row].Value = xcsClassifier.Numerosity.ToString();
+            dataGridView[5, row].Value = xcsClassifier.Timestamp.ToString();
+            dataGridView[6, row].Value = xcsClassifier.Experience.ToString();
+            dataGridView[7, row].Value = xcsClassifier.AverageActionSetSize.ToString();
+            row++;
+          }
+
+          dataGridView.AutoResizeColumns(DataGridViewAutoSizeColumnsMode.ColumnHeader);
+          dataGridView.AutoResizeRowHeadersWidth(DataGridViewRowHeadersWidthSizeMode.AutoSizeToAllHeaders);
         }
-
-        dataGridView.RowCount = Content.Count;
-
-        int row = 0;
-        foreach (var xcsClassifier in Content) {
-          dataGridView[0, row].Value = xcsClassifier.Classifier.ToString();
-          dataGridView[1, row].Value = xcsClassifier.Prediction.ToString();
-          dataGridView[2, row].Value = xcsClassifier.PredictionError.ToString();
-          dataGridView[3, row].Value = xcsClassifier.Fitness.ToString();
-          dataGridView[4, row].Value = xcsClassifier.Numerosity.ToString();
-          dataGridView[5, row].Value = xcsClassifier.Timestamp.ToString();
-          dataGridView[6, row].Value = xcsClassifier.Experience.ToString();
-          dataGridView[7, row].Value = xcsClassifier.AverageActionSetSize.ToString();
-          row++;
-        }
-
-        dataGridView.AutoResizeColumns(DataGridViewAutoSizeColumnsMode.ColumnHeader);
-        dataGridView.AutoResizeRowHeadersWidth(DataGridViewRowHeadersWidthSizeMode.AutoSizeToAllHeaders);
       }
     }

branches/LearningClassifierSystems/LearningClassifierSystem.sln

@@ -17 +17 @@
 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
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Problems.Instances.ConditionActionClassification", "HeuristicLab.Problems.Instances.ConditionActionClassification\3.3\HeuristicLab.Problems.Instances.ConditionActionClassification.csproj", "{1CC7585E-DD22-41FA-869B-93DE41EA8936}"
 EndProject
 Global
@@ -72 +74 @@
     {8FFB8E0F-BC17-4D72-AF0F-E67A22F8EDE5}.Release|x64.ActiveCfg = Release|Any CPU
     {8FFB8E0F-BC17-4D72-AF0F-E67A22F8EDE5}.Release|x86.ActiveCfg = Release|Any CPU
+    {1CC7585E-DD22-41FA-869B-93DE41EA8936}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+    {1CC7585E-DD22-41FA-869B-93DE41EA8936}.Debug|Any CPU.Build.0 = Debug|Any CPU
+    {1CC7585E-DD22-41FA-869B-93DE41EA8936}.Debug|x64.ActiveCfg = Debug|Any CPU
+    {1CC7585E-DD22-41FA-869B-93DE41EA8936}.Debug|x86.ActiveCfg = Debug|Any CPU
+    {1CC7585E-DD22-41FA-869B-93DE41EA8936}.Release|Any CPU.ActiveCfg = Release|Any CPU
+    {1CC7585E-DD22-41FA-869B-93DE41EA8936}.Release|Any CPU.Build.0 = Release|Any CPU
+    {1CC7585E-DD22-41FA-869B-93DE41EA8936}.Release|x64.ActiveCfg = Release|Any CPU
+    {1CC7585E-DD22-41FA-869B-93DE41EA8936}.Release|x86.ActiveCfg = Release|Any CPU
   EndGlobalSection
   GlobalSection(SolutionProperties) = preSolution

@@ -1 +1 @@
 obj
 Plugin.cs
+*.user