Changeset 12224

Timestamp:

03/18/15 16:48:11 (10 years ago)

Author:

pfleck

Message:

#2350 Fixed a bug when selecting an individual for replacement during move-up recursion.

File:

• branches/ALPS/HeuristicLab.Algorithms.ALPS.SteadyState/3.3/AlpsSsMover.cs (modified) (5 diffs)

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

@@ -74 +74 @@
       get { return (ILookupParameter<IntArray>)Parameters["AgeLimits"]; }
     }
+    private ILookupParameter<IntValue> ElitesParameter {
+      get { return (ILookupParameter<IntValue>)Parameters["Elites"]; }
+    }
     #endregion
 
@@ -100 +103 @@
       Parameters.Add(new LookupParameter<IntValue>("EvaluatedSolutions"));
       Parameters.Add(new LookupParameter<IntArray>("AgeLimits"));
+      Parameters.Add(new LookupParameter<IntValue>("Elites"));
     }
 
@@ -111 +115 @@
     private IntArray ageLimits;
     private bool maximization;
+    private int elites;
     public override IOperation Apply() {
       int i = LayerParameter.ActualValue.Value;
@@ -122 +127 @@
       ageLimits = AgeLimitsParameter.ActualValue;
       maximization = MaximizationParameter.ActualValue.Value;
+      elites = ElitesParameter.ActualValue.Value;
 
       layers = LayersScopeParameter.ActualValue;
@@ -164 +170 @@
         return toOldIndividual.index;
 
+      // Take last, because it is the worst quality (sorted already before choosing TargetIndex)
+      var worstIndividual = individuals.LastOrDefault();
       double replaceQuality = ((DoubleValue)individualToReplace.Variables[qualityVariableName].Value).Value;
-      var sortedIndividuals = maximization ? individuals.OrderBy(x => x.quality) : individuals.OrderByDescending(x => x.quality);
-      var worstIndividual = sortedIndividuals.FirstOrDefault(x => maximization ? x.quality < replaceQuality : x.quality > replaceQuality);
-      if (worstIndividual != null)
+      if (worstIndividual != null && (maximization ? worstIndividual.quality < replaceQuality : worstIndividual.quality > replaceQuality))
         return worstIndividual.index;
 
-      return Enumerable.Range(0, layer.SubScopes.Count).SampleRandom(rand);
+      return rand.Next(elites, layer.SubScopes.Count);
     }
   }