Changeset 11585

Timestamp:

11/25/14 15:25:01 (9 years ago)

Author:

pfleck

Message:

#2269 Implemented EldersEmigrator.

• Implemented EldersSelector and ShiftToRightMigrator.

Location:

branches/ALPS/HeuristicLab.Algorithms.ALPS/3.3

Files:

• AlpsGeneticAlgorithm.cs (modified) (2 diffs)
• AlpsGeneticAlgorithmMainLoop.cs (modified) (3 diffs)
• EldersEmigrator.cs (added)
• EldersSelector.cs (added)
• HeuristicLab.Algorithms.ALPS-3.3.csproj (modified) (1 diff)
• ShiftToRightMigrator.cs (added)

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

@@ -230 +230 @@
       var layer0Processor = new SubScopesProcessor();
       var localRandomCreator = new LocalRandomCreator();
+      var layerVariableCreator = new VariableCreator();
       var layerSolutionsCreator = new SolutionsCreator();
       var initializeAgeProcessor = new UniformSubScopesProcessor();
@@ -251 +252 @@
       layer0Processor.Successor = initializeGlobalEvaluatedSolutions;
 
-      localRandomCreator.Successor = layerSolutionsCreator;
+      localRandomCreator.Successor = layerVariableCreator;
+
+      layerVariableCreator.CollectedValues.Add(new ValueParameter<IntValue>("Layer", new IntValue(0)));
+      layerVariableCreator.Successor = layerSolutionsCreator;
 
       layerSolutionsCreator.NumberOfSolutionsParameter.ActualName = PopulationSizeParameter.Name;

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

@@ -35 +35 @@
 
   [Item("AlpsGeneticAlgorithmMainLoop", "An ALPS genetic algorithm main loop operator.")]
+  [StorableClass]
   public sealed class AlpsGeneticAlgorithmMainLoop : AlgorithmOperator {
     #region Parameter Properties
@@ -129 +130 @@
       var generationsIcrementor = new IntCounter() { Name = "Increment Generations" };
       var evaluatedSolutionsReducer = new DataReducer() { Name = "Increment EvaluatedSolutions" };
-      var eldersEmigrator = new CombinedOperator() { Name = "Emigrate Elders" };
+      var eldersEmigrator = new EldersEmigrator() { Name = "Emigrate Elders" };
       var layerUpdator = new CombinedOperator() { Name = "Update Layers" };
       var analyzerPlaceholder = new Placeholder() { Name = "Analyzer (Placeholder)" };
@@ -228 +229 @@
 
       // Remove unnessesary subtrees
-      //foreach (var @operator in mainLoop.OperatorGraph.Iterate().OfType<SingleSuccessorOperator>().Where(o => o.Successor == selector))
+      //foreach (var @operator in mainLoop.OperatorGraph.Operators.OfType<SingleSuccessorOperator>().Where(o => o.Successor == selector))
       //  @operator.Successor = null;
 

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

@@ -81 +81 @@
     <Compile Include="AlpsGeneticAlgorithm.cs" />
     <Compile Include="AlpsGeneticAlgorithmMainLoop.cs" />
+    <Compile Include="EldersEmigrator.cs" />
+    <Compile Include="EldersSelector.cs" />
     <Compile Include="MatingPoolCreator.cs" />
     <Compile Include="Plugin.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="ShiftToRightMigrator.cs" />
   </ItemGroup>
   <ItemGroup>