Changeset 12036

Timestamp:

02/18/15 17:24:39 (10 years ago)

Author:

pfleck

Message:

#2269

• Used Left/RightSelector instead of First/LastSubScopesProcessor
• Used the LayerUniformSubScopesProcessor for reseeding and opening new layer to take usage of the per-layer parameterization.
• Added LayerSorter because layers are sorted wrong after MergingReducer.
• Removed obsolete LastSubScopeCloner.

Location:

branches/ALPS/HeuristicLab.Algorithms.ALPS/3.3

Files:

• HeuristicLab.Algorithms.ALPS-3.3.csproj (modified) (1 diff)
• LastSubScopeCloner.cs (deleted)
• LayerSorter.cs (added)
• LayerUpdator.cs (modified) (5 diffs)

branches/ALPS/HeuristicLab.Algorithms.ALPS/3.3/HeuristicLab.Algorithms.ALPS-3.3.csproj

@@ -91 +91 @@
     <Compile Include="EldersEmigrator.cs" />
     <Compile Include="EldersSelector.cs" />
-    <Compile Include="LastSubScopeCloner.cs" />
     <Compile Include="LayerCreator.cs" />
+    <Compile Include="LayerSorter.cs" />
     <Compile Include="LayerUniformSubScopesProcessor.cs" />
     <Compile Include="LayerUpdator.cs" />

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

@@ -29 +29 @@
 using HeuristicLab.Parameters;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
+using HeuristicLab.Selection;
 
 namespace HeuristicLab.Algorithms.ALPS {
@@ -60 +61 @@
       var incrOpenLayers = new IntCounter() { Name = "Incr. OpenLayers" };
       var newLayerResultsCollector = new ResultsCollector() { Name = "Collect new Layer Results" };
-      var newLayerProsessor = new LastSubScopeProcessor();
+      var newLayerSelector = new RightSelector();
+      var newLayerProsessor = new SubScopesProcessor();
+      var newLayerLayerProcessor = new LayerUniformSubScopesProcessor();
+      var newLayerReducer = new MergingReducer();
       var layerInitializer = new Assigner() { Name = "Init Layer" };
       var correctAgeProcessor = new UniformSubScopesProcessor() { Name = "Hack: Decrement Age" };
@@ -66 +70 @@
       var incrEvaluatedSolutionsForNewLayer = new SubScopesCounter() { Name = "Update EvaluatedSolutions" };
       var newResultCollectionAssigner = new Assigner() { Name = "Empty Results" };
-      var regenerateLayerZeroProsessor = new FirstSubScopeProcessor();
+      var regenerateLayerZeroSelector = new LeftSelector();
+      var regenerateLayerZeroProsessor = new SubScopesProcessor();
+      var regenerateLayerZeroLayerProsessor = new LayerUniformSubScopesProcessor();
+      var regenerateLayerZeroReducer = new MergingReducer();
+      var layerSorter = new LayerSorter();
       var subScopesRemover = new SubScopesRemover();
       var solutionsCreator = new SolutionsCreator();
@@ -99 +107 @@
       openNewLayerBranch.ConditionParameter.ActualName = "OpenNewLayer";
       openNewLayerBranch.TrueBranch = layerCreator;
-      openNewLayerBranch.Successor = regenerateLayerZeroProsessor;
+      openNewLayerBranch.Successor = regenerateLayerZeroSelector;
 
-      //layerCloner.Successor = newLayerProsessor;
-      layerCreator.Successor = newLayerProsessor;
+      layerCreator.Successor = newLayerSelector;
 
-      //newLayerProsessor.Operator = layerInitializer;
-      newLayerProsessor.Operator = incrEvaluatedSolutionsForNewLayer;
-      newLayerProsessor.Successor = incrOpenLayers;
+      newLayerSelector.NumberOfSelectedSubScopesParameter.Value = new IntValue(1);
+      newLayerSelector.CopySelected = new BoolValue(false);
+      newLayerSelector.Successor = newLayerProsessor;
+
+      newLayerProsessor.Operators.Add(new EmptyOperator());
+      newLayerProsessor.Operators.Add(newLayerLayerProcessor);
+      newLayerProsessor.Successor = newLayerReducer;
+
+      newLayerLayerProcessor.Operator = incrEvaluatedSolutionsForNewLayer;
+
+      newLayerReducer.Successor = incrOpenLayers;
 
       layerInitializer.LeftSideParameter.ActualName = "Layer";
@@ -136 +151 @@
       newLayerResultsCollector.Successor = null;
 
-      regenerateLayerZeroProsessor.Operator = subScopesRemover;
-      regenerateLayerZeroProsessor.Successor = resetGenSlr;
+      regenerateLayerZeroSelector.NumberOfSelectedSubScopesParameter.Value = new IntValue(1);
+      regenerateLayerZeroSelector.CopySelected = new BoolValue(false);
+      regenerateLayerZeroSelector.Successor = regenerateLayerZeroProsessor;
+
+      regenerateLayerZeroProsessor.Operators.Add(new EmptyOperator());
+      regenerateLayerZeroProsessor.Operators.Add(regenerateLayerZeroLayerProsessor);
+      regenerateLayerZeroProsessor.Successor = regenerateLayerZeroReducer;
+
+      regenerateLayerZeroLayerProsessor.Operator = subScopesRemover;
+
+      regenerateLayerZeroReducer.Successor = layerSorter;
+
+      layerSorter.Successor = resetGenSlr;
 
       subScopesRemover.Successor = solutionsCreator;