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

Timestamp:

12/01/14 16:23:24 (10 years ago)

Author:

pfleck

Message:

#2269

• Fixed Bugs with Per-Layer-Results.
• Fixed Bugs in EldersSelector.
• Added LayerCreator instead of LastSubScopeCloner for avoiding operators for some temporary hacks.

File:

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

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

@@ -65 +65 @@
       int layer = LayerParameter.ActualValue.Value;
 
-      if (layer >= numberOfLayers) // is max layer?
+      if (layer >= numberOfLayers - 1) // is max layer?
         return new IScope[0];
 
       int limit = ageLimits[layer];
-      var elders =
+      var eldersQuery =
         from scope in scopes
         let age = ((IntValue)scope.Variables["Age"].Value).Value
@@ -75 +75 @@
         select scope;
 
-      return elders.ToArray();
+      var elders = eldersQuery.ToArray();
+
+      if (!CopySelected.Value)
+        foreach (var elder in elders)
+          scopes.Remove(elder);
+
+      return elders;
     }
   }