Changeset 3854 for trunk

Timestamp:

05/20/10 13:35:55 (15 years ago)

Author:

abeham

Message:

#1018

• Removed offspring that are added to the temporary population from their current sub-scope

File:

• trunk/sources/HeuristicLab.Selection/3.3/OffspringSelector.cs (modified) (3 diffs)

trunk/sources/HeuristicLab.Selection/3.3/OffspringSelector.cs

@@ -83 +83 @@
       IScope offspring = scope.SubScopes[1];
       int populationSize = parents.SubScopes.Count;
-      int offspringSize = offspring.SubScopes.Count;
 
       // retrieve actual selection pressure and success ratio
@@ -115 +114 @@
       string tname = SuccessfulOffspringParameter.TranslatedName;
       double tmpSelPress = selectionPressure.Value, tmpSelPressInc = 1.0 / populationSize;
-      for (int i = 0; i < offspringSize; i++) {
+      for (int i = 0; i < offspring.SubScopes.Count; i++) {
         // fetch value
         IVariable tmpVar;
@@ -124 +123 @@
         // add to population
         if (tmp.Value) {
-          population.Add(offspring.SubScopes[i]);
+          IScope currentOffspring = offspring.SubScopes[i];
+          offspring.SubScopes.Remove(currentOffspring);
+          i--;
+          population.Add(currentOffspring);
           successfulOffspringAdded++;
         } else if (worseOffspringNeeded > 0 || tmpSelPress >= maxSelPress) {
-          population.Add(offspring.SubScopes[i]);
+          IScope currentOffspring = offspring.SubScopes[i];
+          offspring.SubScopes.Remove(currentOffspring);
+          i--;
+          population.Add(currentOffspring);
           worseOffspringNeeded--;
         }