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

Timestamp:

02/25/13 12:37:18 (12 years ago)

Author:

sforsten

Message:

#1980:

• fixed several bugs (crossover, subsumption, serialization etc.)
• added ModuloOperator
• CombinedIntegerVectorClassificationProblem\Data and VariableVectorClassificationProblem\Data inherit from ConditionActionClassificationProblem\Data
• it can now be set how often the analyzers have to be executed
• VariableVectorAction, VariableVectorCondition and VariableVectorInput now inherit from Item

File:

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

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

@@ -69 +69 @@
       get { return (ValueLookupParameter<IOperator>)Parameters["FinalAnalyzer"]; }
     }
+    public ValueLookupParameter<IntValue> AnalyzeInIterationParameter {
+      get { return (ValueLookupParameter<IntValue>)Parameters["AnalyzeInIteration"]; }
+    }
     #endregion
 
@@ -114 +117 @@
       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."));
+      Parameters.Add(new ValueLookupParameter<IntValue>("AnalyzeInIteration", ""));
       #endregion
 
@@ -119 +123 @@
       VariableCreator variableCreator = new VariableCreator();
       ResultsCollector resultsCollector = new ResultsCollector();
+      ModuloOperator moduloOperator = new ModuloOperator();
+      Comparator analyzerComparator = new Comparator();
+      ConditionalBranch analyzerConditionalBranch = new ConditionalBranch();
       Placeholder analyzer = new Placeholder();
       Placeholder finalAnalyzer = new Placeholder();
@@ -183 +190 @@
       resultsCollector.CollectedValues.Add(new LookupParameter<IntValue>("Iteration"));
       resultsCollector.ResultsParameter.ActualName = "Results";
+
+      moduloOperator.LeftSideParameter.ActualName = "Iteration";
+      moduloOperator.RightSideParameter.ActualName = AnalyzeInIterationParameter.ActualName;
+      moduloOperator.ResultParameter.ActualName = "ModuloResult";
+
+      analyzerComparator.LeftSideParameter.ActualName = "ModuloResult";
+      analyzerComparator.RightSideParameter.Value = new IntValue(0);
+      analyzerComparator.ResultParameter.ActualName = "DoAnalyzing";
+
+      analyzerConditionalBranch.ConditionParameter.ActualName = "DoAnalyzing";
 
       analyzer.Name = "Analyzer";
@@ -403 +420 @@
       deletionSelectorAfterGA.Successor = leftReducerAfterGA;
       leftReducerAfterGA.Successor = iterationCounter;
-      iterationCounter.Successor = analyzer;
-      analyzer.Successor = maxIterationsComparator;
+      iterationCounter.Successor = moduloOperator;
+      moduloOperator.Successor = analyzerComparator;
+      analyzerComparator.Successor = analyzerConditionalBranch;
+      analyzerConditionalBranch.Successor = maxIterationsComparator;
+      analyzerConditionalBranch.TrueBranch = analyzer;
       #endregion
     }