Changeset 9226 for branches/LearningClassifierSystems/HeuristicLab.Algorithms.LearningClassifierSystems/3.3

Timestamp:

02/18/13 16:51:42 (11 years ago)

Author:

sforsten

Message:

#1980:

• made classes in Problems.ConditionActionClassification abstract
• added Problems.VariableVectorClassification and Problems.CombinedIntegerVectorClassification
• LCS works now with arbitrary problems, which implement ConditionActionClassificationProblem

Location:

branches/LearningClassifierSystems

Files:

• . (modified) (1 prop)
• HeuristicLab.Algorithms.LearningClassifierSystems/3.3/LCSAdaptedGeneticAlgorithm.cs (modified) (4 diffs)
• HeuristicLab.Algorithms.LearningClassifierSystems/3.3/LearningClassifierSystemMainLoop.cs (modified) (7 diffs)

branches/LearningClassifierSystems

@@ -1 +1 @@
 *.suo
+bin

@@ -1 +1 @@
 *.suo
+bin

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

@@ -95 +95 @@
     }
     #endregion
+
+    private CheckGASubsumptionOperator checkGASubsumptionOperator;
 
     [StorableConstructor]
@@ -155 +157 @@
       Assigner setSubsumpByAssigner = new Assigner();
       Assigner setSubsumptionFalseAssigner = new Assigner();
-      CheckGASubsumptionOperator checkGASubsumptionOperator = new CheckGASubsumptionOperator();
+      checkGASubsumptionOperator = new CheckGASubsumptionOperator();
       ConditionalBranch doGASubsumptionBranch2 = new ConditionalBranch();
       ExecuteGASubsumptionOperator executeGAsubsumptionOperator = new ExecuteGASubsumptionOperator();
@@ -199 +201 @@
       doGASubsumptionBranch1.ConditionParameter.ActualName = DoGASubsumptionParameter.ActualName;
 
-      checkGASubsumptionOperator.ChildClassifiersParameter.ActualName = "CombinedIntegerVector";
-      checkGASubsumptionOperator.ParentsClassifiersParameter.ActualName = "CombinedIntegerVector";
       checkGASubsumptionOperator.NumerositiesParameter.ActualName = "Numerosity";
       checkGASubsumptionOperator.ExperiencesParameter.ActualName = "Experience";
@@ -283 +283 @@
       return base.Apply();
     }
+
+    public void SetChildName(string childName) {
+      checkGASubsumptionOperator.ChildClassifiersParameter.ActualName = childName;
+      checkGASubsumptionOperator.ParentsClassifiersParameter.ActualName = childName;
+    }
   }
 }

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

@@ -79 +79 @@
     private CoveringOperator covering;
     private CountNumberOfUniqueActions countNumberOfUniqueActions;
+    private MatchActionOperator matchActionOperator;
+    private InsertInPopulationOperator insertInPopulation;
 
     private LCSAdaptedGeneticAlgorithm adaptedGeneticAlgorithmMainLoop;
@@ -130 +132 @@
       actionSelector = new ActionSelector();
       UniformSubScopesProcessor matchActionSubScopesProcessor = new UniformSubScopesProcessor();
-      MatchActionOperator matchActionOperator = new MatchActionOperator();
+      matchActionOperator = new MatchActionOperator();
       ConditionalSelector conditionMatchSelector = new ConditionalSelector();
       ConditionalSelector actionMatchSelector = new ConditionalSelector();
@@ -165 +167 @@
       UniformSubScopesProcessor setDeletionFalseSubScopeProcessor2 = new UniformSubScopesProcessor();
       Assigner setDeletionFalseAssigner = new Assigner();
-      InsertInPopulationOperator insertInPopulation = new InsertInPopulationOperator();
+      insertInPopulation = new InsertInPopulationOperator();
       XCSDeletionOperator deletionOperatorAfterGA = new XCSDeletionOperator();
       ConditionalSelector deletionSelectorAfterGA = new ConditionalSelector();
@@ -205 +207 @@
       iterationCounter.IncrementParameter.ActualName = "OneIntValue";
 
-      matchConditionOperator.MatchParameter.ActualName = "CombinedIntegerVector";
-
       conditionMatchSelector.CopySelected = new BoolValue(false);
       conditionMatchSelector.ConditionParameter.ActualName = matchConditionOperator.MatchConditionParameter.ActualName;
 
-      countNumberOfUniqueActions.ClassifiersParameter.ActualName = "CombinedIntegerVector";
-
-      doDeletionBeforeCovering.ClassifiersParameter.ActualName = "CombinedIntegerVector";
       doDeletionBeforeCovering.MatchConditionParameter.ActualName = matchConditionOperator.MatchConditionParameter.ActualName;
       doDeletionBeforeCovering.CurrentPopulationSizeParameter.ActualName = "CurrentPopulationSize";
@@ -242 +239 @@
       matchActionSubScopesProcessor.Operator = matchActionOperator;
 
-      matchActionOperator.MatchParameter.ActualName = "CombinedIntegerVector";
       matchActionOperator.TargetMatchParameter.ActualName = actionSelector.SelectedActionParameter.ActualName;
-
-      predictionArrayCalculator.MatchParameter.ActualName = "CombinedIntegerVector";
 
       actionSelector.PredictionArrayParameter.ActualName = predictionArrayCalculator.PredictionArrayParameter.Name;
@@ -321 +315 @@
       currentPopulationSizeCounter.Increment = new IntValue(2);
 
-      insertInPopulation.ClassifiersParameter.ActualName = "CombinedIntegerVector";
       insertInPopulation.NumerositiesParameter.ActualName = "Numerosity";
       insertInPopulation.HasToBeDeletedParameter.ActualName = HASTOBEDELETED;
@@ -462 +455 @@
 
       countNumberOfUniqueActions.ClassifierComparerParameter.ActualName = problem.ClassifierComparerParameter.Name;
+
+      matchConditionOperator.MatchParameter.ActualName = problem.ChildName;
+      countNumberOfUniqueActions.ClassifiersParameter.ActualName = problem.ChildName;
+      doDeletionBeforeCovering.ClassifiersParameter.ActualName = problem.ChildName;
+      matchActionOperator.MatchParameter.ActualName = problem.ChildName;
+      predictionArrayCalculator.MatchParameter.ActualName = problem.ChildName;
+      insertInPopulation.ClassifiersParameter.ActualName = problem.ChildName;
+
+      adaptedGeneticAlgorithmMainLoop.SetChildName(problem.ChildName);
     }
     //private void ParameterizeSelectors() {

@@ -1 +1 @@
 *.suo
+bin