Changeset 13046 for branches/ALPS/HeuristicLab.Algorithms.ALPS/3.3/EldersSelector.cs

Timestamp:

10/21/15 17:42:18 (9 years ago)

Author:

pfleck

Message:

#2269

• Changed the age type from int to double.
• Changed EldersSelector to make use of a ScopeTreeLookupParameter.
• Removed unused operators in LayerUpdator.

File:

• branches/ALPS/HeuristicLab.Algorithms.ALPS/3.3/EldersSelector.cs (modified) (4 diffs)

branches/ALPS/HeuristicLab.Algorithms.ALPS/3.3/EldersSelector.cs

@@ -33 +33 @@
   [Item("EldersSelector", "Select all individuals which are to old for their current layer.")]
   [StorableClass]
-  public sealed class EldersSelector : SingleObjectiveSelector {
-
+  public sealed class EldersSelector : Selector {
+    private IScopeTreeLookupParameter<DoubleValue> AgeParameter {
+      get { return (IScopeTreeLookupParameter<DoubleValue>)Parameters["Age"]; }
+    }
     private ILookupParameter<IntArray> AgeLimitsParameter {
       get { return (ILookupParameter<IntArray>)Parameters["AgeLimits"]; }
@@ -55 +57 @@
     public EldersSelector()
       : base() {
+      Parameters.Add(new ScopeTreeLookupParameter<DoubleValue>("Age"));
       Parameters.Add(new LookupParameter<IntArray>("AgeLimits"));
       Parameters.Add(new LookupParameter<IntValue>("NumberOfLayers"));
@@ -61 +64 @@
 
     protected override IScope[] Select(List<IScope> scopes) {
+      var ages = AgeParameter.ActualValue;
       var ageLimits = AgeLimitsParameter.ActualValue;
       int numberOfLayers = NumberOfLayersParameter.ActualValue.Value;
@@ -69 +73 @@
 
       int limit = ageLimits[layer];
-      var eldersQuery =
-        from scope in scopes
-        let age = ((IntValue)scope.Variables["Age"].Value).Value
-        where age > limit
-        select scope;
+      var elders = ages
+        .Select((x, index) => new { index, age = x.Value })
+        .Where(x => x.age > limit)
+        .ToList();
 
-      var elders = eldersQuery.ToArray();
-
-      if (!CopySelected.Value)
-        foreach (var elder in elders)
-          scopes.Remove(elder);
-
-      return elders;
+      IScope[] selected = new IScope[elders.Count];
+      for (int i = 0; i < elders.Count; i++) {
+        selected[i] = scopes[elders[i].index];
+        scopes[elders[i].index] = null;
+      }
+      scopes.RemoveAll(x => x == null);
+      return selected;
     }
   }