Changeset 9167 for branches/LearningClassifierSystems/HeuristicLab.Algorithms.LearningClassifierSystems

Timestamp:

01/15/13 15:52:54 (12 years ago)

Author:

sforsten

Message:

#1980:

• change standard parameter settings in ConditionActionClassificationProblem
• fixed bug: if a parent is copied instead of a crossover, the new individual is inserted in the population correctly
• added missing attributes to ConditionActionClassificationProblemData

Location:

branches/LearningClassifierSystems/HeuristicLab.Algorithms.LearningClassifierSystems/3.3

Files:

• LCSAdaptedGeneticAlgorithm.cs (modified) (5 diffs)
• LearningClassifierSystemMainLoop.cs (modified) (5 diffs)

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

@@ -54 +54 @@
       get { return (ValueLookupParameter<IOperator>)Parameters["Selector"]; }
     }
+    public ValueLookupParameter<IOperator> AfterCopyingParentsParameter {
+      get { return (ValueLookupParameter<IOperator>)Parameters["AfterCopyingParents"]; }
+    }
     public ValueLookupParameter<IOperator> CrossoverParameter {
       get { return (ValueLookupParameter<IOperator>)Parameters["Crossover"]; }
@@ -112 +115 @@
       Parameters.Add(new ScopeTreeLookupParameter<DoubleValue>("Quality", "The value which represents the quality of a solution."));
       Parameters.Add(new ValueLookupParameter<IOperator>("Selector", "The operator used to select solutions for reproduction."));
+      Parameters.Add(new ValueLookupParameter<IOperator>("AfterCopyingParents", "The operator executed after copying a parent instead of using crossover."));
       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."));
@@ -135 +139 @@
       RandomSelector randomSelector = new RandomSelector();
       PreservingRightReducer preservingRightReducer = new PreservingRightReducer();
-      Assigner numerosityAssigner = new Assigner();
-      Assigner experienceAssigner = new Assigner();
+      Placeholder afterCopyingParents = new Placeholder();
       Placeholder crossover = new Placeholder();
       Placeholder afterCrossover = new Placeholder();
@@ -182 +185 @@
       randomSelector.NumberOfSelectedSubScopesParameter.Value = new IntValue(1);
 
+      afterCopyingParents.Name = "AfterCopyingParents";
+      afterCopyingParents.OperatorParameter.ActualName = "AfterCopyingParents";
+
       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";
@@ -254 +254 @@
       crossoverStochasticBranch.SecondBranch = randomSelector;
       randomSelector.Successor = preservingRightReducer;
-      preservingRightReducer.Successor = numerosityAssigner;
-      numerosityAssigner.Successor = experienceAssigner;
-      experienceAssigner.Successor = null;
+      preservingRightReducer.Successor = afterCopyingParents;
       crossoverStochasticBranch.Successor = mutator;
       crossover.Successor = afterCrossover;

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

@@ -52 +52 @@
       get { return (IConstrainedValueParameter<IManipulator>)Parameters["Mutator"]; }
     }
+    public IConstrainedValueParameter<IOperator> AfterCopyingParentsParameter {
+      get { return (IConstrainedValueParameter<IOperator>)Parameters["AfterCopyingParents"]; }
+    }
     public IConstrainedValueParameter<IOperator> AfterCrossoverParameter {
       get { return (IConstrainedValueParameter<IOperator>)Parameters["AfterCrossover"]; }
@@ -101 +104 @@
       test.ChildParameter.ActualName = "CombinedIntegerVector";
       Parameters.Add(new OptionalConstrainedValueParameter<IManipulator>("Mutator", "The operator used to mutate solutions.", new ItemSet<IManipulator>() { new UniformSomePositionManipulator() }, test));
+      XCSAfterCopyingParentOperator afterCopyingParents = new XCSAfterCopyingParentOperator();
+      Parameters.Add(new ConstrainedValueParameter<IOperator>("AfterCopyingParents", "", new ItemSet<IOperator>() { new XCSAfterCopyingParentOperator() }, afterCopyingParents));
       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 ConstrainedValueParameter<IOperator>("AfterCrossover", "", 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
@@ -315 +312 @@
       adaptedGeneticAlgorithmMainLoop.MaximizationParameter.Value = new BoolValue(true);
       adaptedGeneticAlgorithmMainLoop.AfterCrossoverParameter.ActualName = AfterCrossoverParameter.Name;
+      adaptedGeneticAlgorithmMainLoop.AfterCopyingParentsParameter.ActualName = AfterCopyingParentsParameter.Name;
 
       currentPopulationSizeCounter.ValueParameter.ActualName = "CurrentPopulationSize";
@@ -351 +349 @@
       initialPopulationConditionalBranch.Successor = maxIterationsComparator;
       maxIterationsComparator.Successor = terminationConditionalBranch1;
-      terminationConditionalBranch1.TrueBranch = finalAnalyzer;
+      //terminationConditionalBranch1.TrueBranch = finalAnalyzer;
       terminationConditionalBranch1.FalseBranch = classifierFetcher;
       classifierFetcher.Successor = matchCondtionSubScopesProcessor;
@@ -410 +408 @@
       //iterationCounter.Successor = maxIterationsComparator;
 
-      iterationCounter.Successor = testReducer;
-      testReducer.Successor = maxIterationsComparator;
+      iterationCounter.Successor = finalAnalyzer;
+      finalAnalyzer.Successor = maxIterationsComparator;
       #endregion
     }