Changeset 12080

Timestamp:

02/26/15 12:44:13 (10 years ago)

Author:

pfleck

Message:

#2269

• LayerUniformSubScopesProcessor does not longer derives from UniformSubScopesProcessor.
• Reverted changes of UniformSubScopesProcessor.

Location:

branches/ALPS

Files:

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

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

@@ -34 +34 @@
   [Item("LayerUniformSubScopesProcessor", "")]
   [StorableClass]
-  public class LayerUniformSubScopesProcessor : UniformSubScopesProcessor {
+  public class LayerUniformSubScopesProcessor : SingleSuccessorOperator {
+    private OperatorParameter OperatorParameter {
+      get { return (OperatorParameter)Parameters["Operator"]; }
+    }
+    public ValueLookupParameter<BoolValue> ParallelParameter {
+      get { return (ValueLookupParameter<BoolValue>)Parameters["Parallel"]; }
+    }
 
     private ILookupParameter<IntArray> PopulationSizeParameter {
       get { return (ILookupParameter<IntArray>)Parameters["PopulationSize"]; }
+    }
+
+    public IOperator Operator {
+      get { return OperatorParameter.Value; }
+      set { OperatorParameter.Value = value; }
+    }
+    public BoolValue Parallel {
+      get { return ParallelParameter.Value; }
+      set { ParallelParameter.Value = value; }
     }
 
@@ -47 +62 @@
     public LayerUniformSubScopesProcessor()
       : base() {
+      Parameters.Add(new OperatorParameter("Operator", "The operator which should be applied on all sub-scopes of the current scope."));
+      Parameters.Add(new ValueLookupParameter<BoolValue>("Parallel", "True if the operator should be applied in parallel on all sub-scopes, otherwise false.", new BoolValue(false)));
+
       Parameters.Add(new LookupParameter<IntArray>("PopulationSize"));
     }
@@ -55 +73 @@
 
     public override IOperation Apply() {
-      OperationCollection next = new OperationCollection(Successor != null ? ExecutionContext.CreateOperation(Successor) : null); // base.base.Apply not possible
+      var next = new OperationCollection(Successor != null ? ExecutionContext.CreateOperation(Successor) : null);
       if (Operator != null) {
-        List<IScope> scopes = GetScopesOnLevel(ExecutionContext.Scope, Depth.Value).ToList();
-        OperationCollection inner = new OperationCollection();
-        inner.Parallel = Parallel == null ? false : Parallel.Value;
+        var scopes = ExecutionContext.Scope.SubScopes;
+        var inner = new OperationCollection() {
+          Parallel = Parallel == null ? false : Parallel.Value
+        };
         for (int i = 0; i < scopes.Count; i++) {
           var layerParameters = new LayerIntermediateParameter {

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 class UniformSubScopesProcessor : SingleSuccessorOperator {
+  public sealed class UniformSubScopesProcessor : SingleSuccessorOperator {
     private OperatorParameter OperatorParameter {
       get { return (OperatorParameter)Parameters["Operator"]; }
@@ -59 +59 @@
 
     [StorableConstructor]
-    protected UniformSubScopesProcessor(bool deserializing) : base(deserializing) { }
-    protected UniformSubScopesProcessor(UniformSubScopesProcessor original, Cloner cloner)
+    private UniformSubScopesProcessor(bool deserializing) : base(deserializing) { }
+    private UniformSubScopesProcessor(UniformSubScopesProcessor original, Cloner cloner)
       : base(original, cloner) {
     }
@@ -88 +88 @@
     }
 
-    protected IEnumerable<IScope> GetScopesOnLevel(IScope scope, int d) {
+    private IEnumerable<IScope> GetScopesOnLevel(IScope scope, int d) {
       if (d == 0) yield return scope;
       else {