Changeset 9167 for branches/LearningClassifierSystems/HeuristicLab.Algorithms.LearningClassifierSystems/3.3/LearningClassifierSystemMainLoop.cs

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

File:

• branches/LearningClassifierSystems/HeuristicLab.Algorithms.LearningClassifierSystems/3.3/LearningClassifierSystemMainLoop.cs (modified) (5 diffs)

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
     }