Changeset 3744 for trunk/sources/HeuristicLab.Selection

Timestamp:

05/10/10 16:19:43 (15 years ago)

Author:

abeham

Message:

#893

• Changed initialization of comparison factor
• fixed some bugs in OffspringSelector

File:

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

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

@@ -114 +114 @@
       // implement the ActualValue fetch here - otherwise the parent scope would also be included, given that there may be 1000 or more parents, this is quite unnecessary
       string tname = SuccessfulOffspringParameter.TranslatedName;
-      double tmpSelPress = selectionPressure.Value, tmpSelPressInc = 1.0 / populationSize;
+      double tmpSelPress = selectionPressure.Value, tmpSelPressInc = 1.0 / offspringSize;
       for (int i = 0; i < offspringSize; i++) {
         // fetch value
@@ -136 +136 @@
 
       // calculate actual selection pressure and success ratio
-      selectionPressure.Value += offspringSize / (double)populationSize;
+      selectionPressure.Value = tmpSelPress;
       currentSuccessRatio.Value = successfulOffspring.Value / ((double)populationSize);
 
@@ -156 +156 @@
         offspring.SubScopes.AddRange(population);
 
-        scope.Variables.Remove(OffspringPopulationParameter.ActualName);
-        scope.Variables.Remove(OffspringPopulationWinnersParameter.ActualName);
+        scope.Variables.Remove(OffspringPopulationParameter.TranslatedName);
+        scope.Variables.Remove(OffspringPopulationWinnersParameter.TranslatedName);
         return base.Apply();
       }