Changeset 12197 for branches/ALPS

Timestamp:

03/13/15 09:58:07 (10 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:

• Alps.cs (modified) (1 diff)
• AlpsGeneticAlgorithmMainLoop.cs (modified) (2 diffs)

branches/ALPS/HeuristicLab.Algorithms.ALPS/3.3/Alps.cs

@@ -37 +37 @@
 namespace HeuristicLab.Algorithms.ALPS {
   [Item("ALPS", "A base class for all ALPS-based algorithms.")]
+  [StorableClass]
   public abstract class Alps : HeuristicOptimizationEngineAlgorithm, IStorableContent {
     public string Filename { get; set; }

branches/ALPS/HeuristicLab.Algorithms.ALPS/3.3/AlpsGeneticAlgorithmMainLoop.cs

@@ -93 +93 @@
       var initializeLayer = new Assigner() { Name = "Reset LayerEvaluatedSolutions" };
       var mainOperator = CreatePreparedGeneticAlgorithmMainLoop();
-      var layerAnalyzerPlaceholder = new Placeholder() { Name = "LayerAnalyzer (Placeholder)" };
       var generationsIcrementor = new IntCounter() { Name = "Increment Generations" };
       var evaluatedSolutionsReducer = new DataReducer() { Name = "Increment EvaluatedSolutions" };
       var eldersEmigrator = new EldersEmigrator() { Name = "Emigrate Elders" };
       var layerUpdator = new LayerUpdator(mainOperator) { Name = "Update Layers" };
+      var layerAnalyzerProcessor = new LayerUniformSubScopesProcessor();
+      var layerAnalyzerPlaceholder = new Placeholder() { Name = "LayerAnalyzer (Placeholder)" };
       var analyzerPlaceholder = new Placeholder() { Name = "Analyzer (Placeholder)" };
       var generationsComparator = new Comparator() { Name = "Generations >= MaximumGenerations" };
@@ -154 +155 @@
       evaluatedSolutionsReducer.Successor = eldersEmigrator;
 
-      mainOperator.Successor = layerAnalyzerPlaceholder;
+      eldersEmigrator.Successor = layerUpdator;
+
+      layerUpdator.Successor = layerAnalyzerProcessor;
+
+      layerAnalyzerProcessor.Operator = layerAnalyzerPlaceholder;
+      layerAnalyzerProcessor.Successor = analyzerPlaceholder;
 
       layerAnalyzerPlaceholder.OperatorParameter.ActualName = LayerAnalyzerParameter.Name;
-      layerAnalyzerPlaceholder.Successor = null;
-
-      eldersEmigrator.Successor = layerUpdator;
-
-      layerUpdator.Successor = analyzerPlaceholder;
 
       analyzerPlaceholder.OperatorParameter.ActualName = AnalyzerParameter.Name;