Changeset 12035 for branches/ALPS/HeuristicLab.Operators

Timestamp:

02/18/15 15:39:21 (10 years ago)

Author:

pfleck

Message:

#2269

• Added LayerUniformSubScopesProcessor which introduces an intermediate ExecutionContext which translates array-based parameters to single-value parameters.
• Updated ALPS-OperatorGraph to make usage of the new LayerUniformSubScopesProcessor.
• Added a temporary operator for calculating number of selected sub scopes because presetting the value during operator parameterization does not work for the new intermediate context.

Note: the change of the PopulationSizeParameter still causes an error when creating a new layer. This will be fixed soon.

File:

• branches/ALPS/HeuristicLab.Operators/3.3/UniformSubScopesProcessor.cs (modified) (3 diffs)

branches/ALPS/HeuristicLab.Operators/3.3/UniformSubScopesProcessor.cs

@@ -34 +34 @@
   [Item("UniformSubScopesProcessor", "An operator which applies a specified operator on all sub-scopes at the given depth of the current scope.")]
   [StorableClass]
-  public sealed class UniformSubScopesProcessor : SingleSuccessorOperator {
+  public class UniformSubScopesProcessor : SingleSuccessorOperator {
     private OperatorParameter OperatorParameter {
       get { return (OperatorParameter)Parameters["Operator"]; }
@@ -59 +59 @@
 
     [StorableConstructor]
-    private UniformSubScopesProcessor(bool deserializing) : base(deserializing) { }
-    private UniformSubScopesProcessor(UniformSubScopesProcessor original, Cloner cloner)
+    protected UniformSubScopesProcessor(bool deserializing) : base(deserializing) { }
+    protected UniformSubScopesProcessor(UniformSubScopesProcessor original, Cloner cloner)
       : base(original, cloner) {
     }
@@ -88 +88 @@
     }
 
-    private IEnumerable<IScope> GetScopesOnLevel(IScope scope, int d) {
+    protected IEnumerable<IScope> GetScopesOnLevel(IScope scope, int d) {
       if (d == 0) yield return scope;
       else {