Changeset 9160 for branches/LearningClassifierSystems/HeuristicLab.Algorithms.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/HeuristicLab.Algorithms.LearningClassifierSystems/3.3

Files:

• HeuristicLab.Algorithms.LearningClassifierSystems-3.3.csproj (modified) (1 diff)
• LCSAdaptedGeneticAlgorithm.cs (modified) (5 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;