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

Timestamp:

01/14/13 15:23:17 (12 years ago)

Author:

sforsten

Message:

#1980:

• added XCSSolution, XCSModel, XCSClassifier to represent the xcs classifier
• XCSSolution also shows the current accuracy (training and test partition has to be added)
• added XCSSolutionAnalyzer to create a XCSSolution during the run of the algorithm
• added XCSModelView to show the xcs model
• fixed a bug in XCSDeletionOperator (sometimes it deleted less classifiers than it should)
• moved some parameter from ConditionActionClassificationProblem to ConditionActionClassificationProblemData

File:

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

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

@@ -55 +55 @@
       get { return (IConstrainedValueParameter<IOperator>)Parameters["AfterCrossover"]; }
     }
+    public LookupParameter<IntValue> MaxIterationsParameter {
+      get { return (LookupParameter<IntValue>)Parameters["MaxIterations"]; }
+    }
+    public ValueLookupParameter<IOperator> AnalyzerParameter {
+      get { return (ValueLookupParameter<IOperator>)Parameters["Analyzer"]; }
+    }
     #endregion
 
@@ -97 +103 @@
       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 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
       VariableCreator variableCreator = new VariableCreator();
+      ResultsCollector resultsCollector = new ResultsCollector();
+      Placeholder finalAnalyzer = new Placeholder();
       ConditionalBranch initialPopulationConditionalBranch = new ConditionalBranch();
       initialSolutionsCreator = new SolutionsCreator();
       Assigner initialPopulationSizeAssigner = new Assigner();
+      Comparator maxIterationsComparator = new Comparator();
+      ConditionalBranch terminationConditionalBranch1 = new ConditionalBranch();
       IntCounter iterationCounter = new IntCounter();
       UniformSubScopesProcessor matchCondtionSubScopesProcessor = new UniformSubScopesProcessor();
@@ -159 +179 @@
       variableCreator.CollectedValues.Add(new ValueParameter<IntValue>("CurrentPopulationSize", new IntValue(0)));
 
+      resultsCollector.CollectedValues.Add(new LookupParameter<IntValue>("Iteration"));
+      resultsCollector.ResultsParameter.ActualName = "Results";
+
+      finalAnalyzer.Name = "Analyzer";
+      finalAnalyzer.OperatorParameter.ActualName = "Analyzer";
+
       initialPopulationConditionalBranch.ConditionParameter.ActualName = "CreateInitialPopulation";
 
@@ -165 +191 @@
       initialPopulationSizeAssigner.LeftSideParameter.ActualName = "CurrentPopulationSize";
       initialPopulationSizeAssigner.RightSideParameter.ActualName = "N";
+
+      maxIterationsComparator.Comparison = new Comparison(ComparisonType.GreaterOrEqual);
+      maxIterationsComparator.LeftSideParameter.ActualName = "Iteration";
+      maxIterationsComparator.RightSideParameter.ActualName = MaxIterationsParameter.ActualName;
+      maxIterationsComparator.ResultParameter.ActualName = "TerminateMaxIterations";
+
+      terminationConditionalBranch1.ConditionParameter.ActualName = "TerminateMaxIterations";
 
       iterationCounter.ValueParameter.ActualName = "Iteration";
@@ -311 +344 @@
       OperatorGraph.InitialOperator = variableCreator;
 
-      variableCreator.Successor = initialPopulationConditionalBranch;
+      variableCreator.Successor = resultsCollector;
+      resultsCollector.Successor = initialPopulationConditionalBranch;
       initialPopulationConditionalBranch.TrueBranch = initialSolutionsCreator;
       initialSolutionsCreator.Successor = initialPopulationSizeAssigner;
       initialPopulationConditionalBranch.FalseBranch = new EmptyOperator();
-      initialPopulationConditionalBranch.Successor = classifierFetcher;
+      initialPopulationConditionalBranch.Successor = maxIterationsComparator;
+      maxIterationsComparator.Successor = terminationConditionalBranch1;
+      terminationConditionalBranch1.TrueBranch = finalAnalyzer;
+      terminationConditionalBranch1.FalseBranch = classifierFetcher;
       classifierFetcher.Successor = matchCondtionSubScopesProcessor;
       matchCondtionSubScopesProcessor.Operator = matchConditionOperator;
@@ -371 +408 @@
       deletionSelectorAfterGA.Successor = leftReducerAfterGA;
       leftReducerAfterGA.Successor = iterationCounter;
-      iterationCounter.Successor = classifierFetcher;
+      //iterationCounter.Successor = maxIterationsComparator;
+
+      iterationCounter.Successor = testReducer;
+      testReducer.Successor = maxIterationsComparator;
       #endregion
     }