Changeset 10643 for trunk/sources/HeuristicLab.Selection/3.3/OffspringSelector.cs

Timestamp:

03/21/14 14:20:03 (10 years ago)

Author:

abeham

Message:

#2172:

• Added hierarchy of parameters to enable this as a hidden parameter in OSGA, SASEGASA, Island-OSGA
  • New default value for Island-OSGA and SASEGASA is true (it will be set to false if loaded from an older file)
• Changed visibility of some properties to public

File:

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

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

@@ -57 +57 @@
     }
 
-    public FixedValueParameter<BoolValue> FillPopulationWithParentsParameter {
-      get { return (FixedValueParameter<BoolValue>)Parameters["FillPopulationWithParents"]; }
+    public IValueLookupParameter<BoolValue> FillPopulationWithParentsParameter {
+      get { return (IValueLookupParameter<BoolValue>)Parameters["FillPopulationWithParents"]; }
     }
 
@@ -64 +64 @@
       get { return OffspringCreatorParameter.Value; }
       set { OffspringCreatorParameter.Value = value; }
-    }
-
-    public bool FillPopulationWithParents {
-      get { return FillPopulationWithParentsParameter.Value.Value; }
-      set { FillPopulationWithParentsParameter.Value.Value = value; }
     }
 
@@ -77 +72 @@
       // BackwardsCompatibility3.3
       #region Backwards compatible code, remove with 3.4
+      if (Parameters.ContainsKey("FillPopulationWithParents") && Parameters["FillPopulationWithParents"] is FixedValueParameter<BoolValue>)
+        Parameters.Remove("FillPopulationWithParents");
       if (!Parameters.ContainsKey("FillPopulationWithParents"))
-        Parameters.Add(new FixedValueParameter<BoolValue>("FillPopulationWithParents", "True if the population should be filled with parent individuals instead of lucky losers.", new BoolValue(false)));
+        Parameters.Add(new ValueLookupParameter<BoolValue>("FillPopulationWithParents", "True if the population should be filled with parent individuals instead of lucky losers."));
       #endregion
     }
@@ -96 +93 @@
       Parameters.Add(new ScopeTreeLookupParameter<BoolValue>("SuccessfulOffspring", "True if the offspring was more successful than its parents.", 2));
       Parameters.Add(new OperatorParameter("OffspringCreator", "The operator used to create new offspring."));
-      Parameters.Add(new FixedValueParameter<BoolValue>("FillPopulationWithParents", "True if the population should be filled with parent individuals instead of lucky losers.", new BoolValue(false)));
+      Parameters.Add(new ValueLookupParameter<BoolValue>("FillPopulationWithParents", "True if the population should be filled with parent individual or false if worse children should be used when the maximum selection pressure is exceeded."));
     }
 
@@ -102 +99 @@
       double maxSelPress = MaximumSelectionPressureParameter.ActualValue.Value;
       double successRatio = SuccessRatioParameter.ActualValue.Value;
+      bool fillPopulationWithParents = FillPopulationWithParentsParameter.ActualValue.Value;
       IScope scope = ExecutionContext.Scope;
       IScope parents = scope.SubScopes[0];
@@ -153 +151 @@
         } else if (worseOffspringNeeded > 0 || tmpSelPress >= maxSelPress) {
           IScope currentOffspring;
-          if (!FillPopulationWithParents || worseOffspringNeeded > 0) {
+          if (!fillPopulationWithParents || worseOffspringNeeded > 0) {
             currentOffspring = offspring.SubScopes[i];
             offspring.SubScopes.Remove(currentOffspring);