Changeset 3379 for trunk/sources/HeuristicLab.Optimization.Operators

Timestamp:

04/17/10 03:05:50 (15 years ago)

Author:

abeham

Message:

Added first working version of offspring selection GA #976
Had to implement a new parameter type (better solution!?)
Updated engine files (they're still throwing exceptions upon load though).
Fixed bug in OffspringSelector

File:

• trunk/sources/HeuristicLab.Optimization.Operators/3.3/OffspringSelector.cs (modified) (4 diffs)

trunk/sources/HeuristicLab.Optimization.Operators/3.3/OffspringSelector.cs ¶

@@ -38 +38 @@
     }
     public ValueLookupParameter<DoubleValue> MaximumSelectionPressureParameter {
-      get { return (ValueLookupParameter<DoubleValue>)Parameters["MaximiumSelectionPressure"]; }
+      get { return (ValueLookupParameter<DoubleValue>)Parameters["MaximumSelectionPressure"]; }
     }
     public ValueLookupParameter<DoubleValue> SuccessRatioParameter {
@@ -49 +49 @@
       get { return (LookupParameter<DoubleValue>)Parameters["CurrentSuccessRatio"]; }
     }
-    public SubScopesLookupParameter<BoolValue> SuccessfulOffspringParameter {
-      get { return (SubScopesLookupParameter<BoolValue>)Parameters["SuccessfulOffspring"]; }
+    public SelectedSubScopesLookupParameter<BoolValue> SuccessfulOffspringParameter {
+      get { return (SelectedSubScopesLookupParameter<BoolValue>)Parameters["SuccessfulOffspring"]; }
     }
     public LookupParameter<ItemList<IScope>> WinnersParameter {
@@ -74 +74 @@
       Parameters.Add(new ValueLookupParameter<DoubleValue>("SelectionPressure", "The amount of selection pressure currently necessary to fulfill the success ratio."));
       Parameters.Add(new ValueLookupParameter<DoubleValue>("CurrentSuccessRatio", "The current success ratio indicates how much of the successful offspring have already been generated."));
-      Parameters.Add(new SubScopesLookupParameter<BoolValue>("SuccessfulOffspring", "True if the offspring was successful, otherwise false."));
+      Parameters.Add(new SelectedSubScopesLookupParameter<BoolValue>("SuccessfulOffspring", "True if the offspring was successful, otherwise false."));
       Parameters.Add(new LookupParameter<ItemList<IScope>>("Winners", "Temporary store of the successful offspring."));
       Parameters.Add(new LookupParameter<ItemList<IScope>>("LuckyLosers", "Temporary store of the lucky losers."));
@@ -145 +145 @@
         scope.SubScopes.Remove(parents);
         scope.SubScopes.Remove(children);
-        for (int i = 0; i < parents.SubScopes.Count; i++)
-          scope.SubScopes.Add(parents.SubScopes[i]);
+        while(parents.SubScopes.Count > 0)
+          scope.SubScopes.Add(parents.SubScopes[0]);
 
         IOperator moreOffspring = OffspringCreatorParameter.ActualValue as IOperator;