Changeset 12159

Timestamp:

03/09/15 10:32:47 (9 years ago)

Author:

pfleck

Message:

#2350

• Changed the SteadyStateMatingPoolCreator to put the mating pool in the working scope.
• Added the ScopeIndexAssigner for setting the correct layer number.
• Adapted the AlpsSsGeneticAlgorithmMainLoop.

Location:

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

Files:

• AlpsSsGeneticAlgorithm.cs (modified) (3 diffs)
• AlpsSsGeneticAlgorithmMainLoop.cs (modified) (4 diffs)
• HeuristicLab.Algorithms.ALPS.SteadyState-3.3.csproj (modified) (1 diff)
• NamedSubScopeProcessor.cs (modified) (2 diffs)
• ScopeIndexAssigner.cs (added)
• SteadyStateMatingPoolCreator.cs (modified) (2 diffs)

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

@@ -135 +135 @@
       var layerProcessor = new /*Layer*/UniformSubScopesProcessor();
       var layerVariableCreator = new VariableCreator() { Name = "Initialize Layer" };
+      var layerNumberCreator = new ScopeIndexAssigner() { Name = "Create Layer Number" };
       var layerSolutionsCreator = new SolutionsCreator();
       var initializeAgeProcessor = new UniformSubScopesProcessor();
@@ -154 +155 @@
       layersProcessor.TargetScopeParameter.ActualName = "Layers";
       layersProcessor.Operator = layerCreator;
+      layersProcessor.Successor = initializeEvaluatedSolutions;
 
       layerCreator.NumberOfSubScopesParameter.ActualName = "NumberOfLayers";
@@ -160 +162 @@
 
       layerProcessor.Operator = layerVariableCreator;
-      layerProcessor.Successor = initializeEvaluatedSolutions;
 
       layerVariableCreator.CollectedValues.Add(new ValueParameter<ResultCollection>("LayerResults"));
-      layerVariableCreator.Successor = layerSolutionsCreator;
+      layerVariableCreator.CollectedValues.Add(new ValueParameter<IntValue>("Layer"));
+      layerVariableCreator.Successor = layerNumberCreator;
+
+      layerNumberCreator.ValueParameter.ActualName = "Layer";
+      layerNumberCreator.Successor = layerSolutionsCreator;
 
       layerSolutionsCreator.NumberOfSolutionsParameter.ActualName = LayerSizeParameter.Name;

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

@@ -71 +71 @@
 
       var variableCreator = new VariableCreator() { Name = "Initialize" };
+      var layersProcessor = new NamedSubScopeProcessor() { Name = "Process Layers" };
       var randomScopeProcessor = new RandomLayerProcessor() { Name = "Select a layer" };
-      var layerPopulationSizeCounter = new SubScopesCounter() { Name = "Count LayerPopulationSize" };
       var isLayerZeroComperator = new Comparator() { Name = "IsLayerZero = Layer == 0" };
       var isLayerZeroBranch = new ConditionalBranch() { Name = "IsLayerZero?" };
@@ -85 +85 @@
       var initializeAge = new Assigner() { Name = "Initialize Age" };
       var selectRandomTargetIndex = new RandomIntAssigner();
-      var copyLayer = new BestSelector();
-      var copyLayerProcessor = new SubScopesProcessor();
       var matingPoolCreator = new SteadyStateMatingPoolCreator() { Name = "Create MatingPool" };
+      var matingPoolProcessor = new NamedSubScopeProcessor() { Name = "Process MatingPool" };
       var matingPoolSize = new SubScopesCounter() { Name = "MatingPoolSize" };
       var matingPoolSizeMin2 = new Comparator() { Name = "ValidParents = MatingPoolSize >= 2" };
@@ -116 +115 @@
       variableCreator.CollectedValues.Add(new ValueParameter<IntValue>("MatingPoolSize", new IntValue(0)));
       variableCreator.CollectedValues.Add(new ValueParameter<BoolValue>("ValidParents", new BoolValue(false)));
-      variableCreator.Successor = randomScopeProcessor;
-
-      randomScopeProcessor.Operator = layerPopulationSizeCounter;
+      variableCreator.CollectedValues.Add(new ValueParameter<BoolValue>("IsLayerZero", new BoolValue(false)));
+      variableCreator.Successor = layersProcessor;
+
+      layersProcessor.Operator = randomScopeProcessor;
+      layersProcessor.TargetScopeParameter.ActualName = "Layers";
+
+      randomScopeProcessor.Operator = isLayerZeroComperator;
       randomScopeProcessor.Successor = incrIterations;
-
-      layerPopulationSizeCounter.ValueParameter.ActualName = "LayerPopulationSize";
-      layerPopulationSizeCounter.AccumulateParameter.Value =  new BoolValue(false);
-      layerPopulationSizeCounter.Successor = isLayerZeroComperator;
 
       isLayerZeroComperator.LeftSideParameter.ActualName = "Layer";
@@ -171 +170 @@
       selectRandomTargetIndex.LeftSideParameter.ActualName = "TargetIndex";
       selectRandomTargetIndex.MinimumParameter.Value = new IntValue(0);
-      selectRandomTargetIndex.MaximumParameter.ActualName = "LayerPopulationSize";
+      selectRandomTargetIndex.MaximumParameter.ActualName = "LayerSize";
       selectRandomTargetIndex.MaximumParameter.Value = null;
-      selectRandomTargetIndex.Successor = copyLayer;
-
-      copyLayer.NumberOfSelectedSubScopesParameter.ActualName = "LayerPopulationSize";
-      copyLayer.CopySelected = new BoolValue(true);
-      copyLayer.Successor = copyLayerProcessor;
-
-      copyLayerProcessor.Operators.Add(new EmptyOperator());
-      copyLayerProcessor.Operators.Add(matingPoolCreator);
-
-      matingPoolCreator.Successor = matingPoolSize;
+      selectRandomTargetIndex.Successor = matingPoolCreator;
+
+      matingPoolCreator.Successor = matingPoolProcessor;
+
+      matingPoolProcessor.Operator = matingPoolSize;
+      matingPoolProcessor.TargetScopeParameter.ActualName = "WorkingScope";
 
       matingPoolSize.ValueParameter.ActualName = "MatingPoolSize";

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

@@ -144 +144 @@
     <Compile Include="RandomIntAssigner.cs" />
     <Compile Include="RandomLayerProcessor.cs" />
+    <Compile Include="ScopeIndexAssigner.cs" />
     <Compile Include="SteadyStateMatingPoolCreator.cs" />
   </ItemGroup>

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

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2013 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.
@@ -22 +22 @@
 using HeuristicLab.Common;
 using HeuristicLab.Core;
-using HeuristicLab.Data;
 using HeuristicLab.Operators;
 using HeuristicLab.Parameters;

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

@@ -32 +32 @@
   [StorableClass]
   public class SteadyStateMatingPoolCreator : SingleSuccessorOperator {
+    private ILookupParameter<IScope> WorkingScopeParameter {
+      get { return (ILookupParameter<IScope>)Parameters["WorkingScope"]; }
+    }
+    private ILookupParameter<IntValue> LayerParameter {
+      get { return (ILookupParameter<IntValue>)Parameters["Layer"]; }
+    }
 
     [StorableConstructor]
@@ -43 +49 @@
     public SteadyStateMatingPoolCreator()
       : base() {
+      Parameters.Add(new LookupParameter<IScope>("WorkingScope"));
+      Parameters.Add(new LookupParameter<IntValue>("Layer"));
     }
 
     public override IOperation Apply() {
-      var matingPool = ExecutionContext.Scope;
-      var currentLayer = matingPool.Parent;
-      int layerNumber = ((IntValue)currentLayer.Variables["Layer"].Value).Value;
+      int layerNumber = LayerParameter.ActualValue.Value;
+      var workingScope = WorkingScopeParameter.ActualValue;
+
+      var currentLayer = ExecutionContext.Scope;
+      foreach (var individual in currentLayer.SubScopes) {
+        workingScope.SubScopes.Add((IScope)individual.Clone());
+      }
 
       if (layerNumber > 0) {
-        var prevLayer = currentLayer.Parent.SubScopes[layerNumber - 1];
-        var prevLayerIndividuals = prevLayer.SubScopes;
+        var layers = currentLayer.Parent;
+        var prevLayer = layers.SubScopes[layerNumber - 1];
 
-        foreach (var individual in prevLayerIndividuals) {
-          matingPool.SubScopes.Add((IScope)individual.Clone());
+        foreach (var individual in prevLayer.SubScopes) {
+          workingScope.SubScopes.Add((IScope)individual.Clone());
         }
       }