Changeset 9105

Timestamp:

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

Author:

sforsten

Message:

#1980:

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

Location:

branches/LearningClassifierSystems

Files:

• HeuristicLab.Algorithms.LearningClassifierSystems/3.3/LCSAdaptedGeneticAlgorithm.cs (modified) (7 diffs)
• HeuristicLab.Algorithms.LearningClassifierSystems/3.3/LearningClassifierSystemMainLoop.cs (modified) (13 diffs)
• HeuristicLab.Encodings.CombinedIntegerVectorEncoding/3.3/CombinedIntegerVector.cs (modified) (2 diffs)
• HeuristicLab.Encodings.CombinedIntegerVectorEncoding/3.3/HeuristicLab.Encodings.CombinedIntegerVectorEncoding-3.3.csproj (modified) (1 diff)
• HeuristicLab.Encodings.ConditionActionEncoding/3.3 (modified) (1 prop)
• HeuristicLab.Encodings.ConditionActionEncoding/3.3/Covering/CoveringOperator.cs (modified) (3 diffs)
• HeuristicLab.Encodings.ConditionActionEncoding/3.3/Covering/DoDeletionBeforeCovering.cs (added)
• HeuristicLab.Encodings.ConditionActionEncoding/3.3/Covering/ICovering.cs (modified) (1 diff)
• HeuristicLab.Encodings.ConditionActionEncoding/3.3/Deletion (added)
• HeuristicLab.Encodings.ConditionActionEncoding/3.3/Deletion/CalculateNumberOfDeletionsOperator.cs (added)
• HeuristicLab.Encodings.ConditionActionEncoding/3.3/Deletion/XCSDeletionOperator.cs (added)
• HeuristicLab.Encodings.ConditionActionEncoding/3.3/GA (added)
• HeuristicLab.Encodings.ConditionActionEncoding/3.3/GA/XCSAfterCrossoverOperator.cs (added)
• HeuristicLab.Encodings.ConditionActionEncoding/3.3/GA/XCSCheckIfGAShouldBeApplied.cs (added)
• HeuristicLab.Encodings.ConditionActionEncoding/3.3/HeuristicLab.Encodings.ConditionActionEncoding-3.3.csproj (modified) (4 diffs)
• HeuristicLab.Encodings.ConditionActionEncoding/3.3/IClassifier.cs (modified) (1 diff)
• HeuristicLab.Encodings.ConditionActionEncoding/3.3/Interfaces/IConditionActionProblem.cs (modified) (1 diff)
• HeuristicLab.Encodings.ConditionActionEncoding/3.3/Operator/SubScopeVariableCopier.cs (added)
• HeuristicLab.Encodings.ConditionActionEncoding/3.3/Subsumption (added)
• HeuristicLab.Encodings.ConditionActionEncoding/3.3/Subsumption/ActionSetSubsumptionoperator.cs (added)
• HeuristicLab.Encodings.ConditionActionEncoding/3.3/Subsumption/IActionSetSubsumption.cs (added)
• HeuristicLab.Problems.ConditionActionClassification/3.3/HeuristicLab.Problems.ConditionActionClassification-3.3.csproj (modified) (2 diffs)
• HeuristicLab.Problems.ConditionActionClassification/3.3/Implementation/ConditionActionClassificationProblem.cs (modified) (4 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;

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

@@ -50 +50 @@
       get { return (IConstrainedValueParameter<IManipulator>)Parameters["Mutator"]; }
     }
+    public IConstrainedValueParameter<IOperator> AfterCrossoverParameter {
+      get { return (IConstrainedValueParameter<IOperator>)Parameters["AfterCrossover"]; }
+    }
     #endregion
 
@@ -57 +60 @@
     private PredictionArrayCalculator predictionArrayCalculator;
     private ActionSelector actionSelector;
+    private DoDeletionBeforeCoveringOperator doDeletionBeforeCovering;
     private CoveringOperator covering;
+    private ConditionalSelector subsumptionSelector;
 
     private Placeholder evaluator;
     private Placeholder actionExecuter;
     private Placeholder classifierFetcher;
+    private Placeholder actionSetSubsumption;
     #endregion
 
@@ -85 +91 @@
       test.IntegerVectorParameter.ActualName = "CombinedIntegerVector";
       Parameters.Add(new OptionalConstrainedValueParameter<IManipulator>("Mutator", "The operator used to mutate solutions.", new ItemSet<IManipulator>() { new UniformOnePositionManipulator() }, test));
+      XCSAfterCrossoverOperator afterCrossover = new XCSAfterCrossoverOperator();
+      Parameters.Add(new ConstrainedValueParameter<IOperator>("AfterCrossover", "The operator used to select solutions for reproduction.", new ItemSet<IOperator>() { new XCSAfterCrossoverOperator() }, afterCrossover));
       #endregion
 
@@ -91 +99 @@
       ConditionalBranch initialPopulationConditionalBranch = new ConditionalBranch();
       initialSolutionsCreator = new SolutionsCreator();
+      Assigner initialPopulationSizeAssigner = new Assigner();
       IntCounter iterationCounter = new IntCounter();
       UniformSubScopesProcessor matchCondtionSubScopesProcessor = new UniformSubScopesProcessor();
@@ -102 +111 @@
       SubScopesProcessor matchSetSubScopesProcessor = new SubScopesProcessor();
       CountNumberOfUniqueActions countNumberOfUniqueActions = new CountNumberOfUniqueActions();
+      doDeletionBeforeCovering = new DoDeletionBeforeCoveringOperator();
+      ConditionalBranch doDeletionBeforeCoveringConditionalBranch = new ConditionalBranch();
+      MergingReducer matchSetMergingReducerForDeletion = new MergingReducer();
+      SubScopeVariableCopier subscopeVariableCopier = new SubScopeVariableCopier();
+      XCSDeletionOperator deletionOperator = new XCSDeletionOperator();
+      ConditionalSelector deletionSelector = new ConditionalSelector();
+      LeftReducer leftReducerAfterDeletionSelection = new LeftReducer();
+      UniformSubScopesProcessor matchConditionAfterDeletionSubScopesProcessor = new UniformSubScopesProcessor();
+      ConditionalSelector conditionMatchSelectorAfterDeletion = new ConditionalSelector();
+      SubScopesProcessor matchSetAfterDeletionSubScopesProcessor = new SubScopesProcessor();
+      CountNumberOfUniqueActions countNumberOfUniqueActionsAfterDeletion = new CountNumberOfUniqueActions();
+      SubScopesProcessor coveringAfterDeletionSubScopesProcessor = new SubScopesProcessor();
       covering = new CoveringOperator();
-      MergingReducer mergingReducer = new MergingReducer();
-      MergingReducer mergingReducerWithSuccessor = new MergingReducer();
+      MergingReducer actionSetMergingReducer = new MergingReducer();
+      MergingReducer matchSetMergingReducer = new MergingReducer();
       evaluator = new Placeholder();
       SubScopesProcessor actionSetSubScopesProcessor = new SubScopesProcessor();
@@ -112 +133 @@
       SumAccuracy sumAccuracy = new SumAccuracy();
       UniformSubScopesProcessor updateParametersSubScopesProcessor = new UniformSubScopesProcessor();
+      ConditionalBranch actionSetSubsumptionBranch = new ConditionalBranch();
+      subsumptionSelector = new ConditionalSelector();
+      LeftReducer leftReducer = new LeftReducer();
+      XCSCheckIfGAShouldBeApplied checkIfGAShouldRun = new XCSCheckIfGAShouldBeApplied();
+      ConditionalBranch runGAConditionalBranch = new ConditionalBranch();
+      UniformSubScopesProcessor timestampAssignerSubscopeProcessor = new UniformSubScopesProcessor();
+      Assigner timestampAssigner = new Assigner();
       LCSAdaptedGeneticAlgorithm adaptedGeneticAlgorithmMainLoop = new LCSAdaptedGeneticAlgorithm();
+      IntCounter currentPopulationSizeCounter = new IntCounter();
+      CalculateNumberOfDeletionsOperator calculateNumberOfDeletions = new CalculateNumberOfDeletionsOperator();
+      XCSDeletionOperator deletionOperatorAfterGA = new XCSDeletionOperator();
+      ConditionalSelector deletionSelectorAfterGA = new ConditionalSelector();
+      LeftReducer leftReducerAfterGA = new LeftReducer();
 
       classifierFetcher = new Placeholder();
       actionExecuter = new Placeholder();
+      actionSetSubsumption = new Placeholder();
 
       variableCreator.CollectedValues.Add(new ValueParameter<IntValue>("ZeroIntValue", new IntValue(0)));
       variableCreator.CollectedValues.Add(new ValueParameter<IntValue>("OneIntValue", new IntValue(1)));
       variableCreator.CollectedValues.Add(new ValueParameter<IntValue>("Iteration", new IntValue(0)));
+      variableCreator.CollectedValues.Add(new ValueParameter<IntValue>("CurrentPopulationSize", new IntValue(0)));
 
       initialPopulationConditionalBranch.ConditionParameter.ActualName = "CreateInitialPopulation";
 
       initialSolutionsCreator.NumberOfSolutionsParameter.ActualName = "N";
+
+      initialPopulationSizeAssigner.LeftSideParameter.ActualName = "CurrentPopulationSize";
+      initialPopulationSizeAssigner.RightSideParameter.ActualName = "N";
 
       iterationCounter.ValueParameter.ActualName = "Iteration";
       iterationCounter.IncrementParameter.ActualName = "OneIntValue";
 
-      matchCondtionSubScopesProcessor.Operator = matchConditionOperator;
-
       matchConditionOperator.MatchParameter.ActualName = "CombinedIntegerVector";
 
@@ -135 +171 @@
       conditionMatchSelector.ConditionParameter.ActualName = "MatchCondition";
 
+      conditionMatchSelectorAfterDeletion.CopySelected = new BoolValue(false);
+      conditionMatchSelectorAfterDeletion.ConditionParameter.ActualName = "MatchCondition";
+
       countNumberOfUniqueActions.ClassifiersParameter.ActualName = "CombinedIntegerVector";
+
+      countNumberOfUniqueActionsAfterDeletion.ClassifiersParameter.ActualName = "CombinedIntegerVector";
+
+      subscopeVariableCopier.SubScopeIndexParameter.Value = new IntValue(1);
+
+      doDeletionBeforeCovering.CurrentPopulationSizeParameter.ActualName = "CurrentPopulationSize";
+      doDeletionBeforeCovering.NumberOfUniqueActionsParameter.ActualName = countNumberOfUniqueActions.NumberOfUniqueActionsParameter.ActualName;
+      doDeletionBeforeCovering.PopulationSizeParameter.ActualName = "N";
+
+      doDeletionBeforeCoveringConditionalBranch.ConditionParameter.ActualName = doDeletionBeforeCovering.DoDeletionParameter.ActualName;
+
+      deletionOperator.NumberToDeleteParameter.ActualName = doDeletionBeforeCovering.NumberToDeleteParameter.ActualName;
+      deletionOperator.AverageActionSetSizesParameter.ActualName = "AverageActionSetSize";
+      deletionOperator.FitnessesParameter.ActualName = "Fitness";
+      deletionOperator.NumerositiesParameter.ActualName = "Numerosity";
+      deletionOperator.ExperiencesParameter.ActualName = "Experience";
+      deletionOperator.ThetaDeletionParameter.ActualName = "ThetaDeletion";
+      deletionOperator.DeltaParameter.ActualName = "Delta";
+      deletionOperator.RandomParameter.ActualName = "Random";
+
+      deletionSelector.ConditionParameter.ActualName = deletionOperator.HasToBeDeletedVariableName;
+      deletionSelector.CopySelected = new BoolValue(false);
 
       covering.ActionsInMatchSetParameter.ActualName = countNumberOfUniqueActions.UniqueActionsParameter.ActualName;
       covering.ParallelParameter.Value.Value = true;
       covering.RandomParameter.ActualName = "Random";
+      covering.CurrentPopulationSizeParameter.ActualName = "CurrentPopulationSize";
 
       matchActionSubScopesProcessor.Operator = matchActionOperator;
@@ -155 +217 @@
       actionMatchSelector.ConditionParameter.ActualName = "MatchAction";
 
+      actionSetSubsumptionBranch.ConditionParameter.ActualName = "DoActionSetSubsumption";
+
+      subsumptionSelector.CopySelected = new BoolValue(false);
+
       SelectorParameter.Value.CopySelected = new BoolValue(true);
-      SelectorParameter.Value.NumberOfSelectedSubScopesParameter.Value = new IntValue(200);
+      SelectorParameter.Value.NumberOfSelectedSubScopesParameter.Value = new IntValue(4);
 
       evaluator.Name = "Evaluator";
@@ -176 +242 @@
       sumAccuracy.AccuracyParameter.ActualName = calculateAccuracy.AccuracyParameter.ActualName;
       sumAccuracy.NumerosityParameter.ActualName = "Numerosity";
+
+      //BEGIN parameters have to be set differently
+      checkIfGAShouldRun.TimeStampsParameter.ActualName = "Timestamp";
+      checkIfGAShouldRun.NumerositiesParameter.ActualName = "Numerosity";
+      checkIfGAShouldRun.ThetaGAParameter.ActualName = "ThetaGA";
+      //END
+      checkIfGAShouldRun.IterationParameter.ActualName = iterationCounter.ValueParameter.ActualName;
+
+      runGAConditionalBranch.ConditionParameter.ActualName = checkIfGAShouldRun.RunGAParameter.ActualName;
+
+      timestampAssigner.LeftSideParameter.ActualName = "Timestamp";
+      timestampAssigner.RightSideParameter.ActualName = iterationCounter.ValueParameter.ActualName;
+
+      afterCrossover.NumerosityParameter.ActualName = "Numerosity";
+      afterCrossover.ExperienceParameter.ActualName = "Experience";
+      afterCrossover.TimestampParameter.ActualName = "Timestamp";
+      afterCrossover.CurrentIterationParameter.ActualName = "Iteration";
+      afterCrossover.FitnessParameter.ActualName = "Fitness";
+      afterCrossover.AverageActionSetSizeParameter.ActualName = "AverageActionSetSize";
+      afterCrossover.PredictionParameter.ActualName = "Prediction";
+      afterCrossover.ErrorParameter.ActualName = "Error";
+      afterCrossover.ParentFitnessParameter.ActualName = "Fitness";
+      afterCrossover.ParentErrorParameter.ActualName = "Error";
+      afterCrossover.ParentPredictionParameter.ActualName = "Prediction";
+      afterCrossover.ParentAverageActionSetSizeParameter.ActualName = "AverageActionSetSize";
 
       adaptedGeneticAlgorithmMainLoop.SelectorParameter.ActualName = SelectorParameter.Name;
@@ -183 +274 @@
       adaptedGeneticAlgorithmMainLoop.MaximumGenerationsParameter.ActualName = "ZeroIntValue";
       adaptedGeneticAlgorithmMainLoop.QualityParameter.ActualName = "Fitness";
-      //needed?
       adaptedGeneticAlgorithmMainLoop.MutationProbabilityParameter.Value = new PercentValue(10);
       adaptedGeneticAlgorithmMainLoop.MaximizationParameter.Value = new BoolValue(true);
+      adaptedGeneticAlgorithmMainLoop.AfterCrossoverParameter.ActualName = AfterCrossoverParameter.Name;
+
+      currentPopulationSizeCounter.ValueParameter.ActualName = "CurrentPopulationSize";
+      currentPopulationSizeCounter.Increment = new IntValue(2);
+
+      calculateNumberOfDeletions.CurrentPopulationSizeParameter.ActualName = "CurrentPopulationSize";
+      calculateNumberOfDeletions.PopulationSizeParameter.ActualName = "N";
+
+      deletionOperatorAfterGA.NumberToDeleteParameter.ActualName = calculateNumberOfDeletions.NumberOfDeletionsParameter.ActualName;
+      deletionOperatorAfterGA.AverageActionSetSizesParameter.ActualName = "AverageActionSetSize";
+      deletionOperatorAfterGA.FitnessesParameter.ActualName = "Fitness";
+      deletionOperatorAfterGA.NumerositiesParameter.ActualName = "Numerosity";
+      deletionOperatorAfterGA.ExperiencesParameter.ActualName = "Experience";
+      deletionOperatorAfterGA.ThetaDeletionParameter.ActualName = "ThetaDeletion";
+      deletionOperatorAfterGA.DeltaParameter.ActualName = "Delta";
+      deletionOperatorAfterGA.RandomParameter.ActualName = "Random";
+
+      deletionSelectorAfterGA.ConditionParameter.ActualName = deletionOperatorAfterGA.HasToBeDeletedVariableName;
+      deletionSelectorAfterGA.CopySelected = new BoolValue(false);
       #endregion
 
@@ -193 +302 @@
       variableCreator.Successor = initialPopulationConditionalBranch;
       initialPopulationConditionalBranch.TrueBranch = initialSolutionsCreator;
+      initialSolutionsCreator.Successor = initialPopulationSizeAssigner;
       initialPopulationConditionalBranch.FalseBranch = new EmptyOperator();
       initialPopulationConditionalBranch.Successor = classifierFetcher;
       classifierFetcher.Successor = matchCondtionSubScopesProcessor;
+      matchCondtionSubScopesProcessor.Operator = matchConditionOperator;
       matchCondtionSubScopesProcessor.Successor = conditionMatchSelector;
-      //variableCreator.Successor = adaptedGeneticAlgorithmMainLoop;
-      //adaptedGeneticAlgorithmMainLoop.Successor = conditionMatchSelector;
-
       conditionMatchSelector.Successor = matchSetSubScopesProcessor;
       matchSetSubScopesProcessor.Operators.Add(new EmptyOperator());
       matchSetSubScopesProcessor.Operators.Add(countNumberOfUniqueActions);
-      matchSetSubScopesProcessor.Successor = mergingReducerWithSuccessor;
-      countNumberOfUniqueActions.Successor = covering;
+      matchSetSubScopesProcessor.Successor = subscopeVariableCopier;
+      subscopeVariableCopier.Successor = doDeletionBeforeCovering;
+      doDeletionBeforeCovering.Successor = doDeletionBeforeCoveringConditionalBranch;
+      doDeletionBeforeCoveringConditionalBranch.TrueBranch = matchSetMergingReducerForDeletion;
+      matchSetMergingReducerForDeletion.Successor = deletionOperator;
+      deletionOperator.Successor = deletionSelector;
+      deletionSelector.Successor = leftReducerAfterDeletionSelection;
+      leftReducerAfterDeletionSelection.Successor = matchConditionAfterDeletionSubScopesProcessor;
+      doDeletionBeforeCoveringConditionalBranch.FalseBranch = coveringAfterDeletionSubScopesProcessor;
+      coveringAfterDeletionSubScopesProcessor.Operators.Add(new EmptyOperator());
+      coveringAfterDeletionSubScopesProcessor.Operators.Add(covering);
+      coveringAfterDeletionSubScopesProcessor.Successor = matchSetMergingReducer;
+      matchConditionAfterDeletionSubScopesProcessor.Operator = matchConditionOperator;
+      matchConditionAfterDeletionSubScopesProcessor.Successor = conditionMatchSelectorAfterDeletion;
+      conditionMatchSelectorAfterDeletion.Successor = matchSetAfterDeletionSubScopesProcessor;
+      matchSetAfterDeletionSubScopesProcessor.Operators.Add(new EmptyOperator());
+      matchSetAfterDeletionSubScopesProcessor.Operators.Add(countNumberOfUniqueActionsAfterDeletion);
+      matchSetAfterDeletionSubScopesProcessor.Successor = matchSetMergingReducer;
+      countNumberOfUniqueActionsAfterDeletion.Successor = covering;
+
       covering.Successor = predictionArrayCalculator;
       predictionArrayCalculator.Successor = actionSelector;
@@ -218 +344 @@
       sumAccuracy.Successor = updateParametersSubScopesProcessor;
       updateParametersSubScopesProcessor.Operator = evaluator;
-
-      actionSetSubScopesProcessor.Successor = mergingReducer;
-
-      mergingReducerWithSuccessor.Successor = iterationCounter;
+      updateParametersSubScopesProcessor.Successor = actionSetSubsumptionBranch;
+      actionSetSubsumptionBranch.TrueBranch = actionSetSubsumption;
+      actionSetSubsumption.Successor = subsumptionSelector;
+      subsumptionSelector.Successor = leftReducer;
+      actionSetSubsumptionBranch.FalseBranch = new EmptyOperator();
+      actionSetSubsumptionBranch.Successor = checkIfGAShouldRun;
+      checkIfGAShouldRun.Successor = runGAConditionalBranch;
+      runGAConditionalBranch.TrueBranch = timestampAssignerSubscopeProcessor;
+      runGAConditionalBranch.FalseBranch = new EmptyOperator();
+      timestampAssignerSubscopeProcessor.Operator = timestampAssigner;
+      timestampAssignerSubscopeProcessor.Successor = adaptedGeneticAlgorithmMainLoop;
+      adaptedGeneticAlgorithmMainLoop.Successor = currentPopulationSizeCounter;
+
+      actionSetSubScopesProcessor.Successor = actionSetMergingReducer;
+
+      matchSetMergingReducer.Successor = calculateNumberOfDeletions;
+      calculateNumberOfDeletions.Successor = deletionOperatorAfterGA;
+      deletionOperatorAfterGA.Successor = deletionSelectorAfterGA;
+      deletionSelectorAfterGA.Successor = leftReducerAfterGA;
+      leftReducerAfterGA.Successor = iterationCounter;
       iterationCounter.Successor = classifierFetcher;
-      //mergingReducer.Successor = adaptedGeneticAlgorithmMainLoop;
       #endregion
     }
@@ -249 +390 @@
       actionExecuter.OperatorParameter.ActualName = problem.ActionExecuterParameter.Name;
 
+      problem.ActionSetSubsumptionOperator.ThetaSubsumptionParameter.ActualName = "ThetaSubsumption";
+      problem.ActionSetSubsumptionOperator.ErrorsParameter.ActualName = "Error";
+      problem.ActionSetSubsumptionOperator.ErrorZeroParameter.ActualName = "ErrorZero";
+      problem.ActionSetSubsumptionOperator.ExperiencesParameter.ActualName = "Experience";
+      problem.ActionSetSubsumptionOperator.NumerositiesParameter.ActualName = "Numerosity";
+
+      subsumptionSelector.ConditionParameter.ActualName = problem.ActionSetSubsumptionOperator.HasBeenSubsumedParameterName;
+
+      actionSetSubsumption.OperatorParameter.ActualName = problem.ActionSetSubsumptionOperatorParameter.Name;
+
       matchConditionOperator.TargetMatchParameter.ActualName = problem.ClassifierFetcher.CurrentClassifierToMatchParameter.ActualName;
+
+      doDeletionBeforeCovering.MinimalNumberOfUniqueActionsParameter.ActualName = problem.ThetaMinimalNumberOfActionsParameter.Name;
 
       covering.SolutionCreatorParameter.ActualName = problem.CoveringSolutionCreatorParameter.Name;

branches/LearningClassifierSystems/HeuristicLab.Encodings.CombinedIntegerVectorEncoding/3.3/CombinedIntegerVector.cs

@@ -48 +48 @@
     public IntMatrix Bounds { get { return (IntMatrix)bounds.Clone(); } }
 
+    public int ConditionLength { get { return Length - actionLength; } }
+
     [StorableConstructor]
     protected CombinedIntegerVector(bool deserializing) : base(deserializing) { }
@@ -184 +186 @@
     }
 
+    public bool IsMoreGeneral(IClassifier target) {
+      var targetVector = target as CombinedIntegerVector;
+      int curbounds;
+
+      if (this.NumberOfGeneralSymbols() <= targetVector.NumberOfGeneralSymbols()) return false;
+
+      for (int i = 0; i < ConditionLength; i++) {
+        curbounds = i % bounds.Rows;
+        if (this[i] != bounds[curbounds, 1] - 1 && this[i] != targetVector[i]) {
+          return false;
+        }
+      }
+      return true;
+    }
+
+    private int NumberOfGeneralSymbols() {
+      int numberOfGeneralSymbols = 0;
+      int curbounds;
+
+      for (int i = 0; i < ConditionLength; i++) {
+        curbounds = i % bounds.Rows;
+        numberOfGeneralSymbols += this[i] == bounds[curbounds, 1] - 1 ? 1 : 0;
+      }
+
+      return numberOfGeneralSymbols;
+    }
+
     public override string ToString() {
       StringBuilder strBuilder = new StringBuilder(this.Length);

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

@@ -95 +95 @@
     <Reference Include="System" />
     <Reference Include="System.Core" />
+    <Reference Include="System.Drawing" />
     <Reference Include="System.Xml.Linq" />
     <Reference Include="System.Data.DataSetExtensions" />

branches/LearningClassifierSystems/HeuristicLab.Encodings.ConditionActionEncoding/3.3

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

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

branches/LearningClassifierSystems/HeuristicLab.Encodings.ConditionActionEncoding/3.3/Covering/CoveringOperator.cs

@@ -53 +53 @@
       get { return (ILookupParameter<IRandom>)Parameters["Random"]; }
     }
+    public ILookupParameter<IntValue> CurrentPopulationSizeParameter {
+      get { return (ILookupParameter<IntValue>)Parameters["CurrentPopulationSize"]; }
+    }
     public IValueLookupParameter<BoolValue> ParallelParameter {
       get { return (IValueLookupParameter<BoolValue>)Parameters["Parallel"]; }
@@ -83 +86 @@
       Parameters.Add(new ValueLookupParameter<BoolValue>("Parallel", "True if the operator should be applied in parallel on all sub-scopes, otherwise false.", new BoolValue(true)));
       Parameters.Add(new ScopeParameter("CurrentScope", "The current scope to which the new solutions are added as sub-scopes."));
+      Parameters.Add(new LookupParameter<IntValue>("CurrentPopulationSize"));
     }
 
@@ -97 +101 @@
         throw new ArgumentException("More classifiers with unique actions shall be created than unique actions are available.");
       }
+
+      CurrentPopulationSizeParameter.ActualValue.Value += count;
 
       int current = CurrentScope.SubScopes.Count;

branches/LearningClassifierSystems/HeuristicLab.Encodings.ConditionActionEncoding/3.3/Covering/ICovering.cs

@@ -33 +33 @@
     IValueLookupParameter<ICoveringSolutionCreator> SolutionCreatorParameter { get; }
     IValueLookupParameter<BoolValue> ParallelParameter { get; }
+
+    ILookupParameter<IntValue> CurrentPopulationSizeParameter { get; }
   }
 }

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

@@ -71 +71 @@
     <Reference Include="System" />
     <Reference Include="System.Core" />
+    <Reference Include="System.Drawing" />
     <Reference Include="System.Xml.Linq" />
     <Reference Include="System.Data.DataSetExtensions" />
@@ -83 +84 @@
     <Compile Include="ActionSelection\RandomActionSelector.cs" />
     <Compile Include="Covering\CoveringOperator.cs" />
+    <Compile Include="Covering\DoDeletionBeforeCovering.cs" />
     <Compile Include="Covering\ICovering.cs" />
     <Compile Include="Covering\ICoveringSolutionCreator.cs" />
+    <Compile Include="Deletion\CalculateNumberOfDeletionsOperator.cs" />
+    <Compile Include="Deletion\XCSDeletionOperator.cs" />
     <Compile Include="Evaluators\XCSEvaluator.cs" />
     <Compile Include="Evaluators\IConditionActionEvaluator.cs" />
     <Compile Include="Evaluators\IXCSEvaluator.cs" />
+    <Compile Include="GA\XCSAfterCrossoverOperator.cs" />
     <Compile Include="IClassifier.cs" />
     <Compile Include="Interfaces\IConditionActionProblem.cs" />
     <Compile Include="Interfaces\IConditionActionProblemData.cs" />
     <Compile Include="Operator\CalculateAccuracy.cs" />
+    <Compile Include="GA\XCSCheckIfGAShouldBeApplied.cs" />
     <Compile Include="Operator\CountNumberOfUniqueActions.cs" />
     <Compile Include="Operator\PredictionArrayCalculator.cs" />
     <Compile Include="Operator\MatchActionOperator.cs" />
     <Compile Include="Operator\MatchConditionOperator.cs" />
+    <Compile Include="Operator\SubScopeVariableCopier.cs" />
     <Compile Include="Operator\SumAccuracy.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
@@ -104 +111 @@
     <Compile Include="Selectors\IMatchSelector.cs" />
     <Compile Include="Selectors\MatchSelector.cs" />
+    <Compile Include="Subsumption\ActionSetSubsumptionoperator.cs" />
+    <Compile Include="Subsumption\IActionSetSubsumption.cs" />
     <None Include="Properties\AssemblyInfo.cs.frame" />
   </ItemGroup>
@@ -112 +121 @@
   <ItemGroup />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <PropertyGroup>
+    <PreBuildEvent>set Path=%25Path%25;$(ProjectDir);$(SolutionDir)
+set ProjectDir=$(ProjectDir)
+set SolutionDir=$(SolutionDir)
+set Outdir=$(Outdir)
+
+call PreBuildEvent.cmd
+</PreBuildEvent>
+  </PropertyGroup>
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.

branches/LearningClassifierSystems/HeuristicLab.Encodings.ConditionActionEncoding/3.3/IClassifier.cs

@@ -35 +35 @@
     bool MatchCondition(IClassifier target);
     bool MatchAction(IClassifier target);
+    bool IsMoreGeneral(IClassifier target);
 
     //to use IMatching as key in a dictionary, Equals and GetHashCode have to be override. 

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

@@ -39 +39 @@
     IParameter CoveringSolutionCreatorParameter { get; }
 
+    IParameter ActionSetSubsumptionOperatorParameter { get; }
+    IActionSetSubsumption ActionSetSubsumptionOperator { get; }
+
     new IXCSEvaluator Evaluator { get; }
   }

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

@@ -65 +65 @@
     <Reference Include="System" />
     <Reference Include="System.Core" />
+    <Reference Include="System.Drawing" />
     <Reference Include="System.Xml.Linq" />
     <Reference Include="System.Data.DataSetExtensions" />
@@ -94 +95 @@
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <PropertyGroup>
+    <PreBuildEvent>set Path=%25Path%25;$(ProjectDir);$(SolutionDir)
+set ProjectDir=$(ProjectDir)
+set SolutionDir=$(SolutionDir)
+set Outdir=$(Outdir)
+
+call PreBuildEvent.cmd
+</PreBuildEvent>
+  </PropertyGroup>
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.

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

@@ -36 +36 @@
     private const string ClassifierFetcherParameterName = "ClassifierFetcher";
     private const string ActionExecuterParameterName = "ActionExecuter";
+    private const string ActionSetSubsumptionOperatorParameterName = "ActionSetSubsumption";
 
     IXCSEvaluator IConditionActionProblem.Evaluator {
@@ -118 +119 @@
     IClassifierFetcher IConditionActionProblem.ClassifierFetcher { get { return ClassifierFetcher; } }
     IParameter IConditionActionProblem.ClassifierFetcherParameter { get { return ClassifierFetcherParameter; } }
+
+
+    public ActionSetSubsumptionoperator ActionSetSubsumptionOperator {
+      get { return ActionSetSubsumptionOperatorParameter.Value; }
+    }
+    public ValueParameter<ActionSetSubsumptionoperator> ActionSetSubsumptionOperatorParameter {
+      get { return (ValueParameter<ActionSetSubsumptionoperator>)Parameters[ActionSetSubsumptionOperatorParameterName]; }
+    }
+    IActionSetSubsumption IConditionActionProblem.ActionSetSubsumptionOperator { get { return ActionSetSubsumptionOperator; } }
+    IParameter IConditionActionProblem.ActionSetSubsumptionOperatorParameter { get { return ActionSetSubsumptionOperatorParameter; } }
 
     private IntValue ThetaMinimalNumberOfActions {
@@ -164 +175 @@
       Parameters.Add(new ValueParameter<CombinedIntegerVectorClassifierFetcher>(ClassifierFetcherParameterName, "", new CombinedIntegerVectorClassifierFetcher()));
       Parameters.Add(new FixedValueParameter<ItemSet<IClassifier>>("PossibleActions"));
-      Parameters.Add(new FixedValueParameter<IntValue>("ThetaMinimalNumberOfActions", "Minimal number of actions, which have to be present in the match set, or else covering will occure."));
+      Parameters.Add(new FixedValueParameter<IntValue>("ThetaMinimalNumberOfActions", "Minimal number of actions, which have to be present in the match set, or else covering will occure.", new IntValue(1)));
 
       Parameters.Add(new ValueParameter<ICoveringSolutionCreator>("CoveringSolutionCreator", "", coveringSolutionCreator));
       Parameters.Add(new FixedValueParameter<PercentValue>("ChangeSymbolProbabilityInCovering", "", new PercentValue(0.5)));
+
+      Parameters.Add(new ValueParameter<ActionSetSubsumptionoperator>(ActionSetSubsumptionOperatorParameterName, "", new ActionSetSubsumptionoperator()));
 
       Evaluator.InitialErrorParameter.ActualName = "InitialError";
@@ -188 +201 @@
       ActionExecuter.NegativeRewardParameter.ActualName = NegativeRewardParameter.Name;
       ActionExecuter.PositiveRewardParameter.ActualName = PositiveRewardParameter.Name;
+
+      ActionSetSubsumptionOperator.ClassifiersParameter.ActualName = "CombinedIntegerVector";
 
       SetPossibleActions();

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