Changeset 9555


Ignore:
Timestamp:
05/29/13 14:30:34 (6 years ago)
Author:
mkommend
Message:

#2038: Adapted GAMainLoop to reuse the existing evaluator block for reevaluations of elites.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/sources/HeuristicLab.Algorithms.GeneticAlgorithm/3.3/GeneticAlgorithmMainLoop.cs

    r9553 r9555  
    148148      ConditionalBranch conditionalBranch = new ConditionalBranch();
    149149      ConditionalBranch reevaluateElitesBranch = new ConditionalBranch();
    150       UniformSubScopesProcessor uniformSubScopesProcessor3 = new UniformSubScopesProcessor();
    151       Placeholder evaluator2 = new Placeholder();
    152       SubScopesCounter subScopesCounter2 = new SubScopesCounter();
    153150
    154151      variableCreator.CollectedValues.Add(new ValueParameter<IntValue>("Generations", new IntValue(0))); // Class GeneticAlgorithm expects this to be called Generations
     
    204201      reevaluateElitesBranch.ConditionParameter.ActualName = "ReevaluateElites";
    205202      reevaluateElitesBranch.Name = "Reevaluate elites ?";
    206 
    207       uniformSubScopesProcessor3.Parallel.Value = true;
    208 
    209       evaluator2.Name = "Evaluator";
    210       evaluator2.OperatorParameter.ActualName = "Evaluator";
    211 
    212       subScopesCounter2.Name = "Increment EvaluatedSolutions";
    213       subScopesCounter2.ValueParameter.ActualName = EvaluatedSolutionsParameter.Name;
    214 
    215203      #endregion
    216204
     
    242230      bestSelector.Successor = rightReducer;
    243231      rightReducer.Successor = reevaluateElitesBranch;
    244       reevaluateElitesBranch.TrueBranch = uniformSubScopesProcessor3;
    245       uniformSubScopesProcessor3.Operator = evaluator;
    246       uniformSubScopesProcessor3.Successor = subScopesCounter2;
     232      reevaluateElitesBranch.TrueBranch = uniformSubScopesProcessor2;
    247233      reevaluateElitesBranch.FalseBranch = null;
    248234      reevaluateElitesBranch.Successor = null;
Note: See TracChangeset for help on using the changeset viewer.