Changeset 12992


Ignore:
Timestamp:
10/09/15 13:47:46 (3 years ago)
Author:
pfleck
Message:

#2269

  • Changed PopulationSize from array to int.
  • Removed obsolete LayerUniformSubScopesProcessor.
Location:
branches/ALPS/HeuristicLab.Algorithms.ALPS/3.3
Files:
1 deleted
5 edited

Legend:

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

    r12570 r12992  
    4141  public sealed class AlpsGeneticAlgorithm : Alps {
    4242    #region Parameter Properties
    43     private IValueParameter<IntArray> PopulationSizeParameter {
    44       get { return (IValueParameter<IntArray>)Parameters["PopulationSize"]; }
     43    private IValueParameter<IntValue> PopulationSizeParameter {
     44      get { return (IValueParameter<IntValue>)Parameters["PopulationSize"]; }
    4545    }
    4646    public IConstrainedValueParameter<ISelector> SelectorParameter {
     
    6868
    6969    #region Properties
    70     public IntArray PopulationSize {
     70    public IntValue PopulationSize {
    7171      get { return PopulationSizeParameter.Value; }
    7272      set { PopulationSizeParameter.Value = value; }
     
    130130    public AlpsGeneticAlgorithm()
    131131      : base() {
    132       Parameters.Add(new ValueParameter<IntArray>("PopulationSize", "The size of the population of solutions each layer.", new IntArray(new[] { 100 })));
     132      Parameters.Add(new ValueParameter<IntValue>("PopulationSize", "The size of the population of solutions each layer.", new IntValue(100)));
    133133      Parameters.Add(new ConstrainedValueParameter<ISelector>("Selector", "The operator used to select solutions for reproduction."));
    134134      Parameters.Add(new ConstrainedValueParameter<ICrossover>("Crossover", "The operator used to cross solutions."));
     
    141141      var globalRandomCreator = new RandomCreator();
    142142      var layer0Creator = new SubScopesCreator() { Name = "Create Layer Zero" };
    143       var layer0Processor = new LayerUniformSubScopesProcessor();
     143      var layer0Processor = new UniformSubScopesProcessor();
    144144      var localRandomCreator = new LocalRandomCreator();
    145145      var layerVariableCreator = new VariableCreator();
  • branches/ALPS/HeuristicLab.Algorithms.ALPS/3.3/AlpsGeneticAlgorithmMainLoop.cs

    r12531 r12992  
    9090      var matingPoolPreSorter = new SubScopesSorter() { Name = "MatingPoolPreSorter" };
    9191      var matingPoolCreator = new MatingPoolCreator() { Name = "Create Mating Pools" };
    92       var matingPoolProcessor = new LayerUniformSubScopesProcessor();
     92      var matingPoolProcessor = new UniformSubScopesProcessor();
    9393      var initializeLayer = new Assigner() { Name = "Reset LayerEvaluatedSolutions" };
    9494      var mainOperator = CreatePreparedGeneticAlgorithmMainLoop();
     
    9797      var eldersEmigrator = new EldersEmigrator() { Name = "Emigrate Elders" };
    9898      var layerUpdator = new LayerUpdator(mainOperator) { Name = "Update Layers" };
    99       var layerAnalyzerProcessor = new LayerUniformSubScopesProcessor();
     99      var layerAnalyzerProcessor = new UniformSubScopesProcessor();
    100100      var layerAnalyzerPlaceholder = new Placeholder() { Name = "LayerAnalyzer (Placeholder)" };
    101101      var analyzerPlaceholder = new Placeholder() { Name = "Analyzer (Placeholder)" };
  • branches/ALPS/HeuristicLab.Algorithms.ALPS/3.3/EldersEmigrator.cs

    r12092 r12992  
    4646      var eldersSelector = new EldersSelector();
    4747      var shiftToRightMigrator = new ShiftToRightMigrator();
    48       var mergingProsessor = new LayerUniformSubScopesProcessor();
     48      var mergingProsessor = new UniformSubScopesProcessor();
    4949      var mergingReducer = new MergingReducer();
    5050      var subScopesCounter = new SubScopesCounter();
  • branches/ALPS/HeuristicLab.Algorithms.ALPS/3.3/HeuristicLab.Algorithms.ALPS-3.3.csproj

    r12863 r12992  
    145145    <Compile Include="LayerCreator.cs" />
    146146    <Compile Include="LayerSorter.cs" />
    147     <Compile Include="LayerUniformSubScopesProcessor.cs" />
    148147    <Compile Include="LayerUpdator.cs" />
    149148    <Compile Include="MatingPoolCreator.cs" />
  • branches/ALPS/HeuristicLab.Algorithms.ALPS/3.3/LayerUpdator.cs

    r12570 r12992  
    6262      var newLayerSelector = new RightSelector();
    6363      var newLayerProsessor = new SubScopesProcessor() { Name = "NewLayerProcessor" };
    64       var newLayerLayerProcessor = new LayerUniformSubScopesProcessor();
     64      var newLayerLayerProcessor = new UniformSubScopesProcessor();
    6565      var newLayerReducer = new MergingReducer();
    6666      var layerInitializer = new Assigner() { Name = "Init Layer" };
     
    7171      var regenerateLayerZeroSelector = new LeftSelector();
    7272      var regenerateLayerZeroProsessor = new SubScopesProcessor() { Name = "LayerZeroProcessor" };
    73       var regenerateLayerZeroLayerProsessor = new LayerUniformSubScopesProcessor();
     73      var regenerateLayerZeroLayerProsessor = new UniformSubScopesProcessor();
    7474      var regenerateLayerZeroReducer = new MergingReducer();
    7575      var layerSorter = new LayerSorter();
Note: See TracChangeset for help on using the changeset viewer.