Free cookie consent management tool by TermsFeed Policy Generator

Changeset 12197


Ignore:
Timestamp:
03/13/15 09:58:07 (9 years ago)
Author:
pfleck
Message:

#2269

  • Put LayerAnalyzer after migrating and layer updates.
  • Added missing StorableClassAttribute on Alps base class.
Location:
branches/ALPS/HeuristicLab.Algorithms.ALPS/3.3
Files:
2 edited

Legend:

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

    r12149 r12197  
    3737namespace HeuristicLab.Algorithms.ALPS {
    3838  [Item("ALPS", "A base class for all ALPS-based algorithms.")]
     39  [StorableClass]
    3940  public abstract class Alps : HeuristicOptimizationEngineAlgorithm, IStorableContent {
    4041    public string Filename { get; set; }
  • branches/ALPS/HeuristicLab.Algorithms.ALPS/3.3/AlpsGeneticAlgorithmMainLoop.cs

    r12186 r12197  
    9393      var initializeLayer = new Assigner() { Name = "Reset LayerEvaluatedSolutions" };
    9494      var mainOperator = CreatePreparedGeneticAlgorithmMainLoop();
    95       var layerAnalyzerPlaceholder = new Placeholder() { Name = "LayerAnalyzer (Placeholder)" };
    9695      var generationsIcrementor = new IntCounter() { Name = "Increment Generations" };
    9796      var evaluatedSolutionsReducer = new DataReducer() { Name = "Increment EvaluatedSolutions" };
    9897      var eldersEmigrator = new EldersEmigrator() { Name = "Emigrate Elders" };
    9998      var layerUpdator = new LayerUpdator(mainOperator) { Name = "Update Layers" };
     99      var layerAnalyzerProcessor = new LayerUniformSubScopesProcessor();
     100      var layerAnalyzerPlaceholder = new Placeholder() { Name = "LayerAnalyzer (Placeholder)" };
    100101      var analyzerPlaceholder = new Placeholder() { Name = "Analyzer (Placeholder)" };
    101102      var generationsComparator = new Comparator() { Name = "Generations >= MaximumGenerations" };
     
    154155      evaluatedSolutionsReducer.Successor = eldersEmigrator;
    155156
    156       mainOperator.Successor = layerAnalyzerPlaceholder;
     157      eldersEmigrator.Successor = layerUpdator;
     158
     159      layerUpdator.Successor = layerAnalyzerProcessor;
     160
     161      layerAnalyzerProcessor.Operator = layerAnalyzerPlaceholder;
     162      layerAnalyzerProcessor.Successor = analyzerPlaceholder;
    157163
    158164      layerAnalyzerPlaceholder.OperatorParameter.ActualName = LayerAnalyzerParameter.Name;
    159       layerAnalyzerPlaceholder.Successor = null;
    160 
    161       eldersEmigrator.Successor = layerUpdator;
    162 
    163       layerUpdator.Successor = analyzerPlaceholder;
    164165
    165166      analyzerPlaceholder.OperatorParameter.ActualName = AnalyzerParameter.Name;
Note: See TracChangeset for help on using the changeset viewer.