Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
06/29/15 17:09:30 (9 years ago)
Author:
pfleck
Message:

#2350 Added Termination Criteria to Steady-State ALPS.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/ALPS/HeuristicLab.Algorithms.ALPS.SteadyState/3.3/AlpsSsGeneticAlgorithmMainLoop.cs

    r12270 r12534  
    2020#endregion
    2121
    22 using System.Linq;
    2322using HeuristicLab.Common;
    2423using HeuristicLab.Core;
     
    2928using HeuristicLab.Parameters;
    3029using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    31 using HeuristicLab.Selection;
    3230
    3331namespace HeuristicLab.Algorithms.ALPS.SteadyState {
     
    107105      var layerAnalyzer = new Placeholder() { Name = "LayerAnalyzer (Placeholder)" };
    108106      var analyzer = new Placeholder() { Name = "Analyzer (Placeholder)" };
    109       var iterationsComparator = new Comparator() { Name = "Iterations >= MaximumIterations" };
    110       var terminateBranch = new ConditionalBranch() { Name = "Terminate?" };
     107      var termination = new TerminationOperator();
    111108
    112109
     
    253250
    254251      analyzer.OperatorParameter.ActualName = "Analyzer";
    255       analyzer.Successor = iterationsComparator;
    256 
    257       iterationsComparator.Comparison = new Comparison(ComparisonType.GreaterOrEqual);
    258       iterationsComparator.LeftSideParameter.ActualName = "Iterations";
    259       iterationsComparator.RightSideParameter.ActualName = MaximumIterationsParameter.Name;
    260       iterationsComparator.ResultParameter.ActualName = "Terminate";
    261       iterationsComparator.Successor = terminateBranch;
    262 
    263       terminateBranch.ConditionParameter.ActualName = "Terminate";
    264       terminateBranch.FalseBranch = initializeBatchIteration;
     252      analyzer.Successor = termination;
     253
     254      termination.ContinueBranch = initializeBatchIteration;
    265255    }
    266256  }
Note: See TracChangeset for help on using the changeset viewer.