Changeset 12040

Timestamp:

02/19/15 13:20:59 (9 years ago)

Author:

pfleck

Message:

#2269
Introduced a parameter to adjust the range of layers used for creating a mating pool.

Location:

branches/ALPS/HeuristicLab.Algorithms.ALPS/3.3

Files:

• AlpsGeneticAlgorithm.cs (modified) (3 diffs)
• MatingPoolCreator.cs (modified) (3 diffs)

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

@@ -87 +87 @@
       get { return (IValueParameter<ReductionOperation>)Parameters["AgeInheritance"]; }
     }
+    private IValueParameter<IntValue> MatingPoolRangeParameter {
+      get { return (IValueParameter<IntValue>)Parameters["MatingPoolRange"]; }
+    }
     public IConstrainedValueParameter<ISelector> SelectorParameter {
       get { return (IConstrainedValueParameter<ISelector>)Parameters["Selector"]; }
@@ -152 +155 @@
       get { return AgeInheritanceParameter.Value; }
       set { AgeInheritanceParameter.Value = value; }
+    }
+    public IntValue MatingPoolRange {
+      get { return MatingPoolRangeParameter.Value; }
+      set { MatingPoolRangeParameter.Value = value; }
     }
     public ISelector Selector {
@@ -222 +229 @@
       Parameters.Add(new ValueParameter<IntArray>("AgeLimits", new IntArray(new[] { 5, 20, 45, 80, 125 })) { Hidden = true });
       Parameters.Add(new ValueParameter<ReductionOperation>("AgeInheritance", "The operator for determining the age of an offspring based the parents' age.", new ReductionOperation(ReductionOperations.Max)) { Hidden = true });
+      Parameters.Add(new ValueParameter<IntValue>("MatingPoolRange", "The range of layers used for creating a mating pool. (1 = current + previous layer)", new IntValue(1)) { Hidden = true });
       Parameters.Add(new ConstrainedValueParameter<ISelector>("Selector", "The operator used to select solutions for reproduction."));
       Parameters.Add(new ConstrainedValueParameter<ICrossover>("Crossover", "The operator used to cross solutions."));

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

@@ -20 +20 @@
 #endregion
 
+using System;
 using HeuristicLab.Common;
 using HeuristicLab.Core;
+using HeuristicLab.Data;
 using HeuristicLab.Operators;
+using HeuristicLab.Parameters;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 
@@ -29 +32 @@
   [StorableClass]
   public sealed class MatingPoolCreator : SingleSuccessorOperator {
+
+    private ILookupParameter<IntValue> MatingPoolRangeParameter {
+      get { return (ILookupParameter<IntValue>)Parameters["MatingPoolRange"]; }
+    }
 
     [StorableConstructor]
@@ -40 +47 @@
     public MatingPoolCreator()
       : base() {
+      Parameters.Add(new LookupParameter<IntValue>("MatingPoolRange"));
     }
 
     public override IOperation Apply() {
-      var subPopulations = ExecutionContext.Scope.SubScopes;
+      var layers = ExecutionContext.Scope.SubScopes;
+      int range = MatingPoolRangeParameter.ActualValue.Value;
 
-      for (int i = subPopulations.Count - 1; i > 0; i--) {
-        var currentSubPopulation = subPopulations[i].SubScopes;
-        var prevSubPopulation = subPopulations[i - 1].SubScopes;
-
-        foreach (var individual in prevSubPopulation)
-          currentSubPopulation.Add((IScope)individual.Clone(new Cloner()));
+      for (int layer = layers.Count - 1; layer > 0; layer--) {
+        var layerScope = layers[layer];
+        for (int n = 1; (n <= range) && (layer - n >= 0); n++) {
+          var prevLayerScope = layers[layer - n];
+          foreach (var individual in prevLayerScope.SubScopes) {
+            layerScope.SubScopes.Add((IScope)individual.Clone(new Cloner()));
+          }
+        }
       }