Changeset 13113 for branches/ALPS

Timestamp:

11/03/15 17:48:37 (9 years ago)

Author:

pfleck

Message:

#2269 Some small changes.

Location:

branches/ALPS/HeuristicLab.Algorithms.ALPS/3.3

Files:

• AlpsGeneticAlgorithm.cs (modified) (2 diffs)
• AlpsGeneticAlgorithmMainLoop.cs (modified) (3 diffs)
• AlpsGeneticAlgorithmMainOperator.cs (modified) (1 diff)

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

@@ -300 +300 @@
       var globalRandomCreator = new RandomCreator();
       var layer0Creator = new SubScopesCreator() { Name = "Create Layer Zero" };
-      var layer0Processor = new UniformSubScopesProcessor();
+      var layer0Processor = new SubScopesProcessor();
       var localRandomCreator = new LocalRandomCreator();
       var layerVariableCreator = new VariableCreator();
@@ -324 +324 @@
       layer0Creator.Successor = layer0Processor;
 
-      layer0Processor.Operator = localRandomCreator;
+      layer0Processor.Operators.Add(localRandomCreator);
       layer0Processor.Successor = initializeGlobalEvaluatedSolutions;
 

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

@@ -79 +79 @@
       var resultsCollector = new ResultsCollector();
       var matingPoolCreator = new MatingPoolCreator() { Name = "Create Mating Pools" };
-      var matingPoolProcessor = new UniformSubScopesProcessor();
+      var matingPoolProcessor = new UniformSubScopesProcessor() { Name = "Process Mating Pools" };
       var initializeLayer = new Assigner() { Name = "Reset LayerEvaluatedSolutions" };
       var mainOperator = AlpsGeneticAlgorithmMainOperator.Create();
@@ -95 +95 @@
 
       variableCreator.CollectedValues.Add(new ValueParameter<IntValue>("Generations", new IntValue(0)));
-      variableCreator.CollectedValues.Add(new ValueParameter<IntValue>("GenerationsSinceLastRefresh", new IntValue(0)));
       variableCreator.CollectedValues.Add(new ValueParameter<IntValue>("OpenLayers", new IntValue(1)));
       variableCreator.Successor = initLayerAnalyzerProcessor;
@@ -159 +158 @@
       var selectorProsessor = new UniformSubScopesProcessor();
       var eldersSelector = new EldersSelector();
-      var shiftToRightMigrator = new UnidirectionalRingMigrator();
+      var shiftToRightMigrator = new UnidirectionalRingMigrator() { Name = "Shift elders to next Layer" };
       var mergingProsessor = new UniformSubScopesProcessor();
       var mergingReducer = new MergingReducer();

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

@@ -40 +40 @@
 
       // Operator starts with calculating number of selected scopes base on plus/comma-selection replacement scheme
-      var numberOfSelectedSubScopesCalculator = new ExpressionCalculator() { Name = "NumberOfSelectedSubScopes = 2 * (PopulationSize - if PlusSelection then 0 else Elites)" };
+      var numberOfSelectedSubScopesCalculator = new ExpressionCalculator() { Name = "NumberOfSelectedSubScopes = 2 * (PopulationSize - (PlusSelection ? 0 : Elites))" };
       var replacementBranch = new ConditionalBranch() { Name = "PlusSelection?" };