Changeset 12220 for branches/ALPS/HeuristicLab.Algorithms.ALPS.SteadyState/3.3/AlpsSsGeneticAlgorithm.cs

Timestamp:

03/18/15 14:25:08 (9 years ago)

Author:

pfleck

Message:

#2350

• Implemented elitism by sorting the layer and restricting the random target index.
• Renamed Layers in LayersScope.

File:

• branches/ALPS/HeuristicLab.Algorithms.ALPS.SteadyState/3.3/AlpsSsGeneticAlgorithm.cs (modified) (4 diffs)

branches/ALPS/HeuristicLab.Algorithms.ALPS.SteadyState/3.3/AlpsSsGeneticAlgorithm.cs

@@ -134 +134 @@
 
       var randomCreator = new RandomCreator();
-      var workingScopeCreator = new NamedSubScopesCreator() { Name = "Create WorkingScope and Layers-Scope" };
+      var workingScopeCreator = new NamedSubScopesCreator() { Name = "Create Working- and Layers-Scope" };
       var layersProcessor = new NamedSubScopeProcessor() { Name = "Process Layers-Scope" };
-      var layerCreator = new SubScopesCreator() { Name = "Create Layer" };
-      var layerProcessor = new /*Layer*/UniformSubScopesProcessor();
+      var layerCreator = new SubScopesCreator() { Name = "Create Layers" };
+      var layerProcessor = new UniformSubScopesProcessor();
       var layerVariableCreator = new VariableCreator() { Name = "Initialize Layer" };
       var layerNumberCreator = new ScopeIndexAssigner() { Name = "Create Layer Number" };
@@ -155 +155 @@
       randomCreator.Successor = workingScopeCreator;
 
-      workingScopeCreator.NamesParameter.Value = new StringArray(new[] { "WorkingScope", "Layers" });
+      workingScopeCreator.NamesParameter.Value = new StringArray(new[] { "WorkingScope", "LayersScope", "ElitesScope" });
       workingScopeCreator.Successor = layersProcessor;
 
-      layersProcessor.TargetScopeParameter.ActualName = "Layers";
+      layersProcessor.TargetScopeParameter.ActualName = "LayersScope";
       layersProcessor.Operator = layerCreator;
       layersProcessor.Successor = initializeEvaluatedSolutions;
@@ -198 +198 @@
 
       resultsCollector.CollectedValues.Add(new LookupParameter<IntValue>("Evaluated Solutions", null, "ResultEvaluatedSolutions"));
+      resultsCollector.CollectedValues.Add(new ScopeTreeLookupParameter<ResultCollection>("LayerResults", "Result set for each layer", "LayerResults", 2));
       resultsCollector.Successor = mainLoop;
 
@@ -204 +205 @@
       var tournamentSelector = SelectorParameter.ValidValues.OfType<TournamentSelector>().FirstOrDefault();
       if (tournamentSelector != null) {
-        tournamentSelector.GroupSizeParameter.Value = new IntValue(5);
+        tournamentSelector.GroupSizeParameter.Value = new IntValue(4);
         SelectorParameter.Value = tournamentSelector;
       }