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

Timestamp:

12/29/12 20:15:48 (12 years ago)

Author:

sforsten

Message:

#1980: implemented covering and changed SinglePointCrossover for CombinedIntegerVectorEncoding

Location:

branches/LearningClassifierSystems/HeuristicLab.Algorithms.LearningClassifierSystems/3.3

Files:

• . (modified) (1 prop)
• LearningClassifierSystemMainLoop.cs (modified) (7 diffs)

branches/LearningClassifierSystems/HeuristicLab.Algorithms.LearningClassifierSystems/3.3

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

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

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

@@ -54 +54 @@
     #region private properties
     private SolutionsCreator initialSolutionsCreator;
-    private SolutionsCreator coveringMechanism;
     private MatchConditionOperator matchConditionOperator;
     private PredictionArrayCalculator predictionArrayCalculator;
     private ActionSelector actionSelector;
+    private CoveringOperator covering;
 
     private Placeholder evaluator;
@@ -100 +100 @@
       ConditionalSelector conditionMatchSelector = new ConditionalSelector();
       ConditionalSelector actionMatchSelector = new ConditionalSelector();
-      SubScopesProcessor coveringSubScopesProcessor = new SubScopesProcessor();
-      SubScopesCounter matchsetCounter = new SubScopesCounter();
-      Comparator comparator = new Comparator();
-      ConditionalBranch coveringConditionalBranch = new ConditionalBranch();
+      SubScopesProcessor matchSetSubScopesProcessor = new SubScopesProcessor();
+      CountNumberOfUniqueActions countNumberOfUniqueActions = new CountNumberOfUniqueActions();
+      covering = new CoveringOperator();
       MergingReducer mergingReducer = new MergingReducer();
       MergingReducer mergingReducerWithSuccessor = new MergingReducer();
-      coveringMechanism = new SolutionsCreator();
       evaluator = new Placeholder();
       SubScopesProcessor actionSetSubScopesProcessor = new SubScopesProcessor();
@@ -137 +135 @@
       conditionMatchSelector.ConditionParameter.ActualName = "MatchCondition";
 
-      matchsetCounter.Name = "Count number of rules in match set";
-      matchsetCounter.AccumulateParameter.Value = new BoolValue(false);
-      matchsetCounter.ValueParameter.ActualName = "MatchSetCount";
-
-      comparator.Comparison = new Comparison(ComparisonType.LessOrEqual);
-      comparator.LeftSideParameter.ActualName = matchsetCounter.ValueParameter.ActualName;
-      comparator.ResultParameter.ActualName = "Covering";
-      //more than zero solutions have to be selected
-      comparator.RightSideParameter.ActualName = "ZeroIntValue";
-
-      coveringConditionalBranch.Name = "Covering Branch";
-      coveringConditionalBranch.ConditionParameter.ActualName = "Covering";
+      countNumberOfUniqueActions.ClassifiersParameter.ActualName = "CombinedIntegerVector";
+
+      covering.ActionsInMatchSetParameter.ActualName = countNumberOfUniqueActions.UniqueActionsParameter.ActualName;
+      covering.ParallelParameter.Value.Value = true;
+      covering.RandomParameter.ActualName = "Random";
 
       matchActionSubScopesProcessor.Operator = matchActionOperator;
@@ -154 +145 @@
       matchActionOperator.MatchParameter.ActualName = "CombinedIntegerVector";
       matchActionOperator.TargetMatchParameter.ActualName = actionSelector.SelectedActionParameter.ActualName;
-
-      coveringMechanism.NumberOfSolutionsParameter.ActualName = "OneIntValue";
 
       predictionArrayCalculator.MatchParameter.ActualName = "CombinedIntegerVector";
@@ -211 +200 @@
       //adaptedGeneticAlgorithmMainLoop.Successor = conditionMatchSelector;
 
-      conditionMatchSelector.Successor = coveringSubScopesProcessor;
-      coveringSubScopesProcessor.Operators.Add(new EmptyOperator());
-      coveringSubScopesProcessor.Operators.Add(matchsetCounter);
-      coveringSubScopesProcessor.Successor = mergingReducerWithSuccessor;
-      matchsetCounter.Successor = comparator;
-      comparator.Successor = coveringConditionalBranch;
-      coveringConditionalBranch.TrueBranch = coveringMechanism;
-      coveringConditionalBranch.FalseBranch = new EmptyOperator();
-      coveringConditionalBranch.Successor = predictionArrayCalculator;
+      conditionMatchSelector.Successor = matchSetSubScopesProcessor;
+      matchSetSubScopesProcessor.Operators.Add(new EmptyOperator());
+      matchSetSubScopesProcessor.Operators.Add(countNumberOfUniqueActions);
+      matchSetSubScopesProcessor.Successor = mergingReducerWithSuccessor;
+      countNumberOfUniqueActions.Successor = covering;
+      covering.Successor = predictionArrayCalculator;
       predictionArrayCalculator.Successor = actionSelector;
       actionSelector.Successor = matchActionSubScopesProcessor;
@@ -253 +239 @@
       initialSolutionsCreator.EvaluatorParameter.ActualName = problem.EvaluatorParameter.Name;
 
-      coveringMechanism.SolutionCreatorParameter.ActualName = problem.SolutionCreatorParameter.Name;
-      coveringMechanism.EvaluatorParameter.ActualName = problem.EvaluatorParameter.Name;
-
       problem.ActionExecuter.SelectedActionParameter.ActualName = actionSelector.SelectedActionParameter.ActualName;
 
@@ -266 +249 @@
       actionExecuter.OperatorParameter.ActualName = problem.ActionExecuterParameter.Name;
 
-      matchConditionOperator.TargetMatchParameter.ActualName = problem.ClassifierFetcher.CurrentClassifierToMatchParameter.Name;
+      matchConditionOperator.TargetMatchParameter.ActualName = problem.ClassifierFetcher.CurrentClassifierToMatchParameter.ActualName;
+
+      covering.SolutionCreatorParameter.ActualName = problem.CoveringSolutionCreatorParameter.Name;
+      covering.EvaluatorParameter.ActualName = problem.EvaluatorParameter.Name;
+      covering.MinimalNumberOfUniqueActionsParameter.ActualName = problem.ThetaMinimalNumberOfActionsParameter.Name;
+      covering.PossibleActionsParameter.ActualName = problem.PossibleActionsParameter.Name;
 
       predictionArrayCalculator.PredictionParameter.ActualName = problem.Evaluator.PredictionParameter.ActualName;

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