- Timestamp:
- 09/24/09 11:37:28 (15 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/sources/HeuristicLab.GP.Algorithms/3.2/OffspringSelectionGP.cs
r2341 r2385 178 178 selPresComparator.GetVariableInfo("Result").ActualName = "TerminationCriterion"; 179 179 180 IOperator baseAndSelPresTerminationCriterion = CombineTerminationCriterions(base.CreateTerminationCondition(), selPresComparator);180 IOperator baseAndSelPresTerminationCriterion = AlgorithmBase.CombineTerminationCriterions(base.CreateTerminationCondition(), selPresComparator); 181 181 182 182 GreaterThanComparator evalSolutionsComparer = new GreaterThanComparator(); … … 185 185 evalSolutionsComparer.GetVariableInfo("Result").ActualName = "TerminationCriterion"; 186 186 187 IOperator combinedTerminationCritertion = CombineTerminationCriterions(baseAndSelPresTerminationCriterion, evalSolutionsComparer);187 IOperator combinedTerminationCritertion = AlgorithmBase.CombineTerminationCriterions(baseAndSelPresTerminationCriterion, evalSolutionsComparer); 188 188 189 189 terminationCritertion.OperatorGraph.AddOperator(combinedTerminationCritertion); 190 190 terminationCritertion.OperatorGraph.InitialOperator = combinedTerminationCritertion; 191 191 return terminationCritertion; 192 }193 194 private IOperator CombineTerminationCriterions(IOperator criterion1, IOperator criterion2) {195 ConditionalBranch branch = new ConditionalBranch();196 branch.GetVariableInfo("Condition").ActualName = "TerminationCriterion";197 branch.AddSubOperator(new EmptyOperator());198 branch.AddSubOperator(criterion2);199 200 SequentialProcessor seq = new SequentialProcessor();201 seq.AddSubOperator(criterion1);202 seq.AddSubOperator(branch);203 204 return seq;205 192 } 206 193
Note: See TracChangeset
for help on using the changeset viewer.