Changeset 11585


Ignore:
Timestamp:
11/25/14 15:25:01 (4 years ago)
Author:
pfleck
Message:

#2269 Implemented EldersEmigrator.

  • Implemented EldersSelector and ShiftToRightMigrator.
Location:
branches/ALPS/HeuristicLab.Algorithms.ALPS/3.3
Files:
3 added
3 edited

Legend:

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

    r11583 r11585  
    230230      var layer0Processor = new SubScopesProcessor();
    231231      var localRandomCreator = new LocalRandomCreator();
     232      var layerVariableCreator = new VariableCreator();
    232233      var layerSolutionsCreator = new SolutionsCreator();
    233234      var initializeAgeProcessor = new UniformSubScopesProcessor();
     
    251252      layer0Processor.Successor = initializeGlobalEvaluatedSolutions;
    252253
    253       localRandomCreator.Successor = layerSolutionsCreator;
     254      localRandomCreator.Successor = layerVariableCreator;
     255
     256      layerVariableCreator.CollectedValues.Add(new ValueParameter<IntValue>("Layer", new IntValue(0)));
     257      layerVariableCreator.Successor = layerSolutionsCreator;
    254258
    255259      layerSolutionsCreator.NumberOfSolutionsParameter.ActualName = PopulationSizeParameter.Name;
  • branches/ALPS/HeuristicLab.Algorithms.ALPS/3.3/AlpsGeneticAlgorithmMainLoop.cs

    r11583 r11585  
    3535
    3636  [Item("AlpsGeneticAlgorithmMainLoop", "An ALPS genetic algorithm main loop operator.")]
     37  [StorableClass]
    3738  public sealed class AlpsGeneticAlgorithmMainLoop : AlgorithmOperator {
    3839    #region Parameter Properties
     
    129130      var generationsIcrementor = new IntCounter() { Name = "Increment Generations" };
    130131      var evaluatedSolutionsReducer = new DataReducer() { Name = "Increment EvaluatedSolutions" };
    131       var eldersEmigrator = new CombinedOperator() { Name = "Emigrate Elders" };
     132      var eldersEmigrator = new EldersEmigrator() { Name = "Emigrate Elders" };
    132133      var layerUpdator = new CombinedOperator() { Name = "Update Layers" };
    133134      var analyzerPlaceholder = new Placeholder() { Name = "Analyzer (Placeholder)" };
     
    228229
    229230      // Remove unnessesary subtrees
    230       //foreach (var @operator in mainLoop.OperatorGraph.Iterate().OfType<SingleSuccessorOperator>().Where(o => o.Successor == selector))
     231      //foreach (var @operator in mainLoop.OperatorGraph.Operators.OfType<SingleSuccessorOperator>().Where(o => o.Successor == selector))
    231232      //  @operator.Successor = null;
    232233
  • branches/ALPS/HeuristicLab.Algorithms.ALPS/3.3/HeuristicLab.Algorithms.ALPS-3.3.csproj

    r11583 r11585  
    8181    <Compile Include="AlpsGeneticAlgorithm.cs" />
    8282    <Compile Include="AlpsGeneticAlgorithmMainLoop.cs" />
     83    <Compile Include="EldersEmigrator.cs" />
     84    <Compile Include="EldersSelector.cs" />
    8385    <Compile Include="MatingPoolCreator.cs" />
    8486    <Compile Include="Plugin.cs" />
    8587    <Compile Include="Properties\AssemblyInfo.cs" />
     88    <Compile Include="ShiftToRightMigrator.cs" />
    8689  </ItemGroup>
    8790  <ItemGroup>
Note: See TracChangeset for help on using the changeset viewer.