Changeset 3672
- Timestamp:
- 05/06/10 14:39:42 (15 years ago)
- Location:
- trunk/sources/HeuristicLab.Algorithms.OffspringSelectionGeneticAlgorithm/3.3
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
TabularUnified trunk/sources/HeuristicLab.Algorithms.OffspringSelectionGeneticAlgorithm/3.3/OffspringSelectionGeneticAlgorithm.cs ¶
r3658 r3672 189 189 } 190 190 private List<IDiscreteDoubleValueModifier> comparisonFactorModifiers; 191 private BestAverageWorstQualityAnalyzer qualityAnalyzer; 192 private ValueAnalyzer selectionPressureAnalyzer; 191 193 #endregion 192 194 … … 346 348 } 347 349 private void InitializeAnalyzers() { 348 //qualityAnalyzer = new PopulationBestAverageWorstQualityAnalyzer(); 350 qualityAnalyzer = new BestAverageWorstQualityAnalyzer(); 351 selectionPressureAnalyzer = new ValueAnalyzer(); 349 352 ParameterizeAnalyzers(); 350 353 } … … 369 372 } 370 373 private void ParameterizeAnalyzers() { 371 //qualityAnalyzer.ResultsParameter.ActualName = "Results"; 374 qualityAnalyzer.ResultsParameter.ActualName = "Results"; 375 selectionPressureAnalyzer.Name = "SelectionPressure Analyzer"; 376 selectionPressureAnalyzer.ResultsParameter.ActualName = "Results"; 377 selectionPressureAnalyzer.ValueParameter.ActualName = "SelectionPressure"; 378 selectionPressureAnalyzer.ValueParameter.Depth = 0; 379 selectionPressureAnalyzer.ValuesParameter.ActualName = "Selection Pressure History"; 372 380 if (Problem != null) { 373 //qualityAnalyzer.MaximizationParameter.ActualName = Problem.MaximizationParameter.Name;374 //qualityAnalyzer.QualityParameter.ActualName = Problem.Evaluator.QualityParameter.ActualName;375 //qualityAnalyzer.BestKnownQualityParameter.ActualName = Problem.BestKnownQualityParameter.Name;381 qualityAnalyzer.MaximizationParameter.ActualName = Problem.MaximizationParameter.Name; 382 qualityAnalyzer.QualityParameter.ActualName = Problem.Evaluator.QualityParameter.ActualName; 383 qualityAnalyzer.BestKnownQualityParameter.ActualName = Problem.BestKnownQualityParameter.Name; 376 384 } 377 385 } … … 434 442 private void UpdateAnalyzers() { 435 443 Analyzer.Operators.Clear(); 436 //Analyzer.Operators.Add(qualityAnalyzer); 444 Analyzer.Operators.Add(qualityAnalyzer); 445 Analyzer.Operators.Add(selectionPressureAnalyzer); 437 446 if (Problem != null) { 438 foreach (IAnalyzer analyzer in Problem.Operators.OfType<IAnalyzer>().OrderBy(x => x.Name)) 447 foreach (IAnalyzer analyzer in Problem.Operators.OfType<IAnalyzer>().OrderBy(x => x.Name)) { 448 foreach (IScopeTreeLookupParameter param in analyzer.Parameters.OfType<IScopeTreeLookupParameter>()) 449 param.Depth = 1; 439 450 Analyzer.Operators.Add(analyzer); 451 } 440 452 } 441 453 } -
TabularUnified trunk/sources/HeuristicLab.Algorithms.OffspringSelectionGeneticAlgorithm/3.3/OffspringSelectionGeneticAlgorithmMainLoop.cs ¶
r3659 r3672 128 128 Placeholder analyzer1 = new Placeholder(); 129 129 ResultsCollector resultsCollector1 = new ResultsCollector(); 130 ResultsCollector resultsCollector2 = new ResultsCollector(); 130 131 OffspringSelectionGeneticAlgorithmMainOperator mainOperator = new OffspringSelectionGeneticAlgorithmMainOperator(); 131 132 IntCounter generationsCounter = new IntCounter(); … … 133 134 Comparator maxSelectionPressureComparator = new Comparator(); 134 135 Placeholder analyzer2 = new Placeholder(); 135 ResultsCollector resultsCollector 2= new ResultsCollector();136 ResultsCollector resultsCollector3 = new ResultsCollector(); 136 137 ConditionalBranch conditionalBranch1 = new ConditionalBranch(); 137 138 ConditionalBranch conditionalBranch2 = new ConditionalBranch(); … … 148 149 analyzer1.OperatorParameter.ActualName = AnalyzerParameter.Name; 149 150 151 resultsCollector1.CopyValue = new BoolValue(false); 150 152 resultsCollector1.CollectedValues.Add(new LookupParameter<IntValue>("Generations")); 151 153 resultsCollector1.CollectedValues.Add(new LookupParameter<IntValue>("Evaluated Solutions", null, "EvaluatedSolutions")); … … 154 156 resultsCollector1.CollectedValues.Add(new LookupParameter<DoubleValue>("Current Success Ratio", null, "CurrentSuccessRatio")); 155 157 resultsCollector1.ResultsParameter.ActualName = ResultsParameter.Name; 158 159 resultsCollector2.CopyValue = new BoolValue(true); 160 resultsCollector2.CollectedValues.Add(new LookupParameter<IntValue>("Evaluated Solutions", null, "EvaluatedSolutions")); 161 resultsCollector2.ResultsParameter.ActualName = ResultsParameter.Name; 156 162 157 163 mainOperator.ComparisonFactorParameter.ActualName = "ComparisonFactor"; … … 188 194 analyzer2.OperatorParameter.ActualName = AnalyzerParameter.Name; 189 195 190 resultsCollector2.CollectedValues.Add(new LookupParameter<IntValue>("Generations")); 191 resultsCollector2.CollectedValues.Add(new LookupParameter<IntValue>("Evaluated Solutions", null, "EvaluatedSolutions")); 192 resultsCollector2.CollectedValues.Add(new LookupParameter<DoubleValue>("Curent Comparison Factor", null, "ComparisonFactor")); 193 resultsCollector2.CollectedValues.Add(new LookupParameter<DoubleValue>("Current Selection Pressure", null, "SelectionPressure")); 194 resultsCollector2.CollectedValues.Add(new LookupParameter<DoubleValue>("Current Success Ratio", null, "CurrentSuccessRatio")); 195 resultsCollector2.ResultsParameter.ActualName = ResultsParameter.Name; 196 resultsCollector3.CopyValue = new BoolValue(true); 197 resultsCollector3.CollectedValues.Add(new LookupParameter<IntValue>("Evaluated Solutions", null, "EvaluatedSolutions")); 198 resultsCollector3.ResultsParameter.ActualName = ResultsParameter.Name; 196 199 197 200 conditionalBranch1.Name = "MaximumSelectionPressure reached?"; … … 207 210 comparisonFactorModifier.Successor = analyzer1; 208 211 analyzer1.Successor = resultsCollector1; 209 resultsCollector1.Successor = mainOperator; 212 resultsCollector1.Successor = resultsCollector2; 213 resultsCollector2.Successor = mainOperator; 210 214 mainOperator.Successor = generationsCounter; 211 215 generationsCounter.Successor = maxGenerationsComparator; 212 216 maxGenerationsComparator.Successor = maxSelectionPressureComparator; 213 217 maxSelectionPressureComparator.Successor = analyzer2; 214 analyzer2.Successor = resultsCollector 2;215 resultsCollector 2.Successor = conditionalBranch1;218 analyzer2.Successor = resultsCollector3; 219 resultsCollector3.Successor = conditionalBranch1; 216 220 conditionalBranch1.FalseBranch = conditionalBranch2; 217 221 conditionalBranch1.TrueBranch = null;
Note: See TracChangeset
for help on using the changeset viewer.