Changeset 13113


Ignore:
Timestamp:
11/03/15 17:48:37 (3 years ago)
Author:
pfleck
Message:

#2269 Some small changes.

Location:
branches/ALPS/HeuristicLab.Algorithms.ALPS/3.3
Files:
3 edited

Legend:

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

    r13110 r13113  
    300300      var globalRandomCreator = new RandomCreator();
    301301      var layer0Creator = new SubScopesCreator() { Name = "Create Layer Zero" };
    302       var layer0Processor = new UniformSubScopesProcessor();
     302      var layer0Processor = new SubScopesProcessor();
    303303      var localRandomCreator = new LocalRandomCreator();
    304304      var layerVariableCreator = new VariableCreator();
     
    324324      layer0Creator.Successor = layer0Processor;
    325325
    326       layer0Processor.Operator = localRandomCreator;
     326      layer0Processor.Operators.Add(localRandomCreator);
    327327      layer0Processor.Successor = initializeGlobalEvaluatedSolutions;
    328328
  • branches/ALPS/HeuristicLab.Algorithms.ALPS/3.3/AlpsGeneticAlgorithmMainLoop.cs

    r13111 r13113  
    7979      var resultsCollector = new ResultsCollector();
    8080      var matingPoolCreator = new MatingPoolCreator() { Name = "Create Mating Pools" };
    81       var matingPoolProcessor = new UniformSubScopesProcessor();
     81      var matingPoolProcessor = new UniformSubScopesProcessor() { Name = "Process Mating Pools" };
    8282      var initializeLayer = new Assigner() { Name = "Reset LayerEvaluatedSolutions" };
    8383      var mainOperator = AlpsGeneticAlgorithmMainOperator.Create();
     
    9595
    9696      variableCreator.CollectedValues.Add(new ValueParameter<IntValue>("Generations", new IntValue(0)));
    97       variableCreator.CollectedValues.Add(new ValueParameter<IntValue>("GenerationsSinceLastRefresh", new IntValue(0)));
    9897      variableCreator.CollectedValues.Add(new ValueParameter<IntValue>("OpenLayers", new IntValue(1)));
    9998      variableCreator.Successor = initLayerAnalyzerProcessor;
     
    159158      var selectorProsessor = new UniformSubScopesProcessor();
    160159      var eldersSelector = new EldersSelector();
    161       var shiftToRightMigrator = new UnidirectionalRingMigrator();
     160      var shiftToRightMigrator = new UnidirectionalRingMigrator() { Name = "Shift elders to next Layer" };
    162161      var mergingProsessor = new UniformSubScopesProcessor();
    163162      var mergingReducer = new MergingReducer();
  • branches/ALPS/HeuristicLab.Algorithms.ALPS/3.3/AlpsGeneticAlgorithmMainOperator.cs

    r13096 r13113  
    4040
    4141      // Operator starts with calculating number of selected scopes base on plus/comma-selection replacement scheme
    42       var numberOfSelectedSubScopesCalculator = new ExpressionCalculator() { Name = "NumberOfSelectedSubScopes = 2 * (PopulationSize - if PlusSelection then 0 else Elites)" };
     42      var numberOfSelectedSubScopesCalculator = new ExpressionCalculator() { Name = "NumberOfSelectedSubScopes = 2 * (PopulationSize - (PlusSelection ? 0 : Elites))" };
    4343      var replacementBranch = new ConditionalBranch() { Name = "PlusSelection?" };
    4444
Note: See TracChangeset for help on using the changeset viewer.