Changeset 9105 for branches/LearningClassifierSystems/HeuristicLab.Algorithms.LearningClassifierSystems/3.3/LCSAdaptedGeneticAlgorithm.cs

Timestamp:

01/03/13 20:19:00 (11 years ago)

Author:

sforsten

Message:

#1980:

• included an adapted version of GA correctly
• added action set subsumption
• added deletion after GA and before covering

File:

• branches/LearningClassifierSystems/HeuristicLab.Algorithms.LearningClassifierSystems/3.3/LCSAdaptedGeneticAlgorithm.cs (modified) (7 diffs)

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

@@ -52 +52 @@
       get { return (ValueLookupParameter<IOperator>)Parameters["Crossover"]; }
     }
+    public ValueLookupParameter<IOperator> AfterCrossoverParameter {
+      get { return (ValueLookupParameter<IOperator>)Parameters["AfterCrossover"]; }
+    }
     public ValueLookupParameter<PercentValue> MutationProbabilityParameter {
       get { return (ValueLookupParameter<PercentValue>)Parameters["MutationProbability"]; }
@@ -102 +105 @@
       Parameters.Add(new ValueLookupParameter<IOperator>("Selector", "The operator used to select solutions for reproduction."));
       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<IOperator>("Mutator", "The operator used to mutate solutions."));
@@ -121 +125 @@
       UniformSubScopesProcessor uniformSubScopesProcessor1 = new UniformSubScopesProcessor();
       Placeholder crossover = new Placeholder();
-      DataReducer dataReducer = new DataReducer();
+      Placeholder afterCrossover = new Placeholder();
       StochasticBranch stochasticBranch = new StochasticBranch();
       Placeholder mutator = new Placeholder();
       SubScopesRemover subScopesRemover = new SubScopesRemover();
       SubScopesCounter subScopesCounter = new SubScopesCounter();
-      SubScopesProcessor subScopesProcessor2 = new SubScopesProcessor();
-      BestSelector bestSelector = new BestSelector();
-      RightReducer rightReducer = new RightReducer();
       MergingReducer mergingReducer = new MergingReducer();
       IntCounter intCounter = new IntCounter();
@@ -151 +152 @@
       crossover.OperatorParameter.ActualName = "Crossover";
 
-      dataReducer.Name = "Average Fitness of Parents";
-      dataReducer.ParameterToReduce.ActualName = "Fitness";
-      dataReducer.ReductionOperation.Value = new ReductionOperation(ReductionOperations.Avg);
-      dataReducer.TargetParameter.ActualName = "Fitness";
-      dataReducer.TargetOperation.Value = new ReductionOperation(ReductionOperations.Assign);
+      afterCrossover.Name = "AfterCrossover";
+      afterCrossover.OperatorParameter.ActualName = "AfterCrossover";
 
       stochasticBranch.ProbabilityParameter.ActualName = "MutationProbability";
@@ -167 +165 @@
       subScopesCounter.Name = "Increment EvaluatedSolutions";
       subScopesCounter.ValueParameter.ActualName = EvaluatedSolutionsParameter.Name;
-
-      bestSelector.CopySelected = new BoolValue(false);
-      bestSelector.MaximizationParameter.ActualName = "Maximization";
-      bestSelector.NumberOfSelectedSubScopesParameter.ActualName = "N";
-      bestSelector.QualityParameter.ActualName = "Fitness";
 
       intCounter.Increment = new IntValue(1);
@@ -195 +188 @@
       subScopesProcessor1.Operators.Add(new EmptyOperator());
       subScopesProcessor1.Operators.Add(childrenCreator);
-      subScopesProcessor1.Successor = subScopesProcessor2;
+      subScopesProcessor1.Successor = mergingReducer;
       childrenCreator.Successor = uniformSubScopesProcessor1;
       uniformSubScopesProcessor1.Operator = crossover;
       uniformSubScopesProcessor1.Successor = subScopesCounter;
-      crossover.Successor = dataReducer;
-      dataReducer.Successor = stochasticBranch;
+      crossover.Successor = afterCrossover;
+      afterCrossover.Successor = stochasticBranch;
       stochasticBranch.FirstBranch = mutator;
       stochasticBranch.SecondBranch = null;
@@ -207 +200 @@
       subScopesRemover.Successor = null;
       subScopesCounter.Successor = null;
-      subScopesProcessor2.Operators.Add(bestSelector);
-      subScopesProcessor2.Operators.Add(new EmptyOperator());
-      subScopesProcessor2.Successor = mergingReducer;
-      bestSelector.Successor = rightReducer;
-      rightReducer.Successor = null;
       mergingReducer.Successor = intCounter;
       intCounter.Successor = comparator;