Changeset 9175 for branches/LearningClassifierSystems/HeuristicLab.Algorithms.LearningClassifierSystems/3.3/LearningClassifierSystemMainLoop.cs
- Timestamp:
- 01/21/13 16:33:47 (11 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/LearningClassifierSystems/HeuristicLab.Algorithms.LearningClassifierSystems/3.3/LearningClassifierSystemMainLoop.cs
r9167 r9175 64 64 get { return (ValueLookupParameter<IOperator>)Parameters["Analyzer"]; } 65 65 } 66 public ValueLookupParameter<IOperator> FinalAnalyzerParameter { 67 get { return (ValueLookupParameter<IOperator>)Parameters["FinalAnalyzer"]; } 68 } 66 69 #endregion 67 70 … … 110 113 Parameters.Add(new LookupParameter<IntValue>("MaxIterations", "The maximum number of iterations the algorithm will do.")); 111 114 Parameters.Add(new ValueLookupParameter<IOperator>("Analyzer", "The operator used to analyze each generation.")); 115 Parameters.Add(new ValueLookupParameter<IOperator>("FinalAnalyzer", "The operator used to analyze the last generation.")); 112 116 #endregion 113 117 … … 115 119 VariableCreator variableCreator = new VariableCreator(); 116 120 ResultsCollector resultsCollector = new ResultsCollector(); 121 Placeholder analyzer = new Placeholder(); 117 122 Placeholder finalAnalyzer = new Placeholder(); 118 123 ConditionalBranch initialPopulationConditionalBranch = new ConditionalBranch(); … … 179 184 resultsCollector.ResultsParameter.ActualName = "Results"; 180 185 181 finalAnalyzer.Name = "Analyzer"; 182 finalAnalyzer.OperatorParameter.ActualName = "Analyzer"; 186 analyzer.Name = "Analyzer"; 187 analyzer.OperatorParameter.ActualName = "Analyzer"; 188 189 finalAnalyzer.Name = "FinalAnalyzer"; 190 finalAnalyzer.OperatorParameter.ActualName = "FinalAnalyzer"; 183 191 184 192 initialPopulationConditionalBranch.ConditionParameter.ActualName = "CreateInitialPopulation"; … … 349 357 initialPopulationConditionalBranch.Successor = maxIterationsComparator; 350 358 maxIterationsComparator.Successor = terminationConditionalBranch1; 351 //terminationConditionalBranch1.TrueBranch = finalAnalyzer;359 terminationConditionalBranch1.TrueBranch = finalAnalyzer; 352 360 terminationConditionalBranch1.FalseBranch = classifierFetcher; 353 361 classifierFetcher.Successor = matchCondtionSubScopesProcessor; … … 406 414 deletionSelectorAfterGA.Successor = leftReducerAfterGA; 407 415 leftReducerAfterGA.Successor = iterationCounter; 408 //iterationCounter.Successor = maxIterationsComparator; 409 410 iterationCounter.Successor = finalAnalyzer; 411 finalAnalyzer.Successor = maxIterationsComparator; 416 iterationCounter.Successor = analyzer; 417 analyzer.Successor = maxIterationsComparator; 412 418 #endregion 413 419 }
Note: See TracChangeset
for help on using the changeset viewer.