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

Timestamp:

01/21/13 16:33:47 (12 years ago)

Author:

sforsten

Message:

#1980:

• added BestTrainingXCSSolutionAnalyzer and CurrentXCSSolutionAnalyzer
• fixed bug: Equals method was not correct in CombinedIntegerVector

Location:

branches/LearningClassifierSystems/HeuristicLab.Algorithms.LearningClassifierSystems/3.3

Files:

• LearningClassifierSystem.cs (modified) (5 diffs)
• LearningClassifierSystemMainLoop.cs (modified) (6 diffs)

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

@@ -112 +112 @@
       get { return (ValueParameter<MultiAnalyzer>)Parameters["Analyzer"]; }
     }
+    private ValueParameter<MultiAnalyzer> FinalAnalyzerParameter {
+      get { return (ValueParameter<MultiAnalyzer>)Parameters["FinalAnalyzer"]; }
+    }
     private ValueParameter<IntValue> MaxIterationsParameter {
       get { return (ValueParameter<IntValue>)Parameters["MaxIterations"]; }
@@ -197 +200 @@
       get { return AnalyzerParameter.Value; }
       set { AnalyzerParameter.Value = value; }
+    }
+    public MultiAnalyzer FinalAnalyzer {
+      get { return FinalAnalyzerParameter.Value; }
+      set { FinalAnalyzerParameter.Value = value; }
     }
     private RandomCreator RandomCreator {
@@ -228 +235 @@
       Parameters.Add(new ValueParameter<BoolValue>("DoActionSetSubsumption", "Specifies if action set is tested for subsuming classifiers.", new BoolValue(true)));
       Parameters.Add(new ValueParameter<MultiAnalyzer>("Analyzer", "The operator used to analyze each generation.", new MultiAnalyzer()));
+      Parameters.Add(new ValueParameter<MultiAnalyzer>("FinalAnalyzer", "The operator used to analyze the last generation.", new MultiAnalyzer()));
       Parameters.Add(new ValueParameter<IntValue>("MaxIterations", "The maximum number of iterations.", new IntValue(1000)));
       #endregion
@@ -246 +254 @@
 
       mainLoop.AnalyzerParameter.ActualName = AnalyzerParameter.Name;
+      mainLoop.FinalAnalyzerParameter.ActualName = FinalAnalyzerParameter.Name;
       mainLoop.MaxIterationsParameter.ActualName = MaxIterationsParameter.Name;
       #endregion
@@ -298 +307 @@
     private void UpdateAnalyzers() {
       Analyzer.Operators.Clear();
+      FinalAnalyzer.Operators.Clear();
       if (Problem != null) {
         foreach (IAnalyzer analyzer in Problem.Operators.OfType<IAnalyzer>()) {
           Analyzer.Operators.Add(analyzer, analyzer.EnabledByDefault);
+          FinalAnalyzer.Operators.Add(analyzer, analyzer.EnabledByDefault);
         }
       }

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

@@ -64 +64 @@
       get { return (ValueLookupParameter<IOperator>)Parameters["Analyzer"]; }
     }
+    public ValueLookupParameter<IOperator> FinalAnalyzerParameter {
+      get { return (ValueLookupParameter<IOperator>)Parameters["FinalAnalyzer"]; }
+    }
     #endregion
 
@@ -110 +113 @@
       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."));
+      Parameters.Add(new ValueLookupParameter<IOperator>("FinalAnalyzer", "The operator used to analyze the last generation."));
       #endregion
 
@@ -115 +119 @@
       VariableCreator variableCreator = new VariableCreator();
       ResultsCollector resultsCollector = new ResultsCollector();
+      Placeholder analyzer = new Placeholder();
       Placeholder finalAnalyzer = new Placeholder();
       ConditionalBranch initialPopulationConditionalBranch = new ConditionalBranch();
@@ -179 +184 @@
       resultsCollector.ResultsParameter.ActualName = "Results";
 
-      finalAnalyzer.Name = "Analyzer";
-      finalAnalyzer.OperatorParameter.ActualName = "Analyzer";
+      analyzer.Name = "Analyzer";
+      analyzer.OperatorParameter.ActualName = "Analyzer";
+
+      finalAnalyzer.Name = "FinalAnalyzer";
+      finalAnalyzer.OperatorParameter.ActualName = "FinalAnalyzer";
 
       initialPopulationConditionalBranch.ConditionParameter.ActualName = "CreateInitialPopulation";
@@ -349 +357 @@
       initialPopulationConditionalBranch.Successor = maxIterationsComparator;
       maxIterationsComparator.Successor = terminationConditionalBranch1;
-      //terminationConditionalBranch1.TrueBranch = finalAnalyzer;
+      terminationConditionalBranch1.TrueBranch = finalAnalyzer;
       terminationConditionalBranch1.FalseBranch = classifierFetcher;
       classifierFetcher.Successor = matchCondtionSubScopesProcessor;
@@ -406 +414 @@
       deletionSelectorAfterGA.Successor = leftReducerAfterGA;
       leftReducerAfterGA.Successor = iterationCounter;
-      //iterationCounter.Successor = maxIterationsComparator;
-
-      iterationCounter.Successor = finalAnalyzer;
-      finalAnalyzer.Successor = maxIterationsComparator;
+      iterationCounter.Successor = analyzer;
+      analyzer.Successor = maxIterationsComparator;
       #endregion
     }