Changeset 12999

Timestamp:

10/13/15 11:18:46 (9 years ago)

Author:

pfleck

Message:

#2269 Removed MatingPoolSelectionPercentageParameter.

Location:

branches/ALPS/HeuristicLab.Algorithms.ALPS/3.3

Files:

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

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

@@ -114 +114 @@
       get { return (IValueParameter<IntValue>)Parameters["MatingPoolRange"]; }
     }
-    private IValueParameter<PercentValue> MatingPoolSelectionPercentageParameter {
-      get { return (IValueLookupParameter<PercentValue>)Parameters["MatingPoolSelectionPercentage"]; }
-    }
 
     private IValueParameter<MultiTerminator> TerminatorParameter {
@@ -198 +195 @@
       get { return MatingPoolRangeParameter.Value; }
       set { MatingPoolRangeParameter.Value = value; }
-    }
-    public PercentValue MatingPoolSelectionPercentage {
-      get { return MatingPoolSelectionPercentageParameter.Value; }
-      set { MatingPoolSelectionPercentageParameter.Value = value; }
     }
 
@@ -303 +296 @@
 
       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 ValueParameter<PercentValue>("MatingPoolSelectionPercentage", "Percentage of the previous layers used for creating a mating pool.", new PercentValue(1.0, restrictToUnitInterval: true)) { Hidden = true });
 
       Parameters.Add(new ValueParameter<MultiTerminator>("Terminator", "The termination criteria which sould be checked.", new MultiTerminator()));

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

@@ -37 +37 @@
       get { return (ILookupParameter<IntValue>)Parameters["MatingPoolRange"]; }
     }
-    public ILookupParameter<PercentValue> MatingPoolSelectionPercentageParameter {
-      get { return (ILookupParameter<PercentValue>)Parameters["MatingPoolSelectionPercentage"]; }
-    }
 
     [StorableConstructor]
@@ -52 +49 @@
       : base() {
       Parameters.Add(new LookupParameter<IntValue>("MatingPoolRange"));
-      Parameters.Add(new LookupParameter<PercentValue>("MatingPoolSelectionPercentage"));
     }
 
@@ -58 +54 @@
       var layers = ExecutionContext.Scope.SubScopes;
       int range = MatingPoolRangeParameter.ActualValue.Value;
-      double percentage = MatingPoolSelectionPercentageParameter.ActualValue.Value;
 
       for (int layer = layers.Count - 1; layer > 0; layer--) {
@@ -65 +60 @@
           var prevLayerScope = layers[layer - n];
           var individuals = prevLayerScope.SubScopes;
-          foreach (var individual in individuals.Take((int)(individuals.Count * percentage))) {
+          foreach (var individual in individuals) {
             layerScope.SubScopes.Add((IScope)individual.Clone(new Cloner()));
           }