Changeset 3193 for trunk/sources/HeuristicLab.Operators

Timestamp:

03/23/10 01:31:17 (14 years ago)

Author:

swagner

Message:

Unified *SequentialSubScopesProcessor and *ParallelSubScopesProcessor (#943).

Location:

trunk/sources/HeuristicLab.Operators/3.3

Files:

• HeuristicLab.Operators-3.3.csproj (modified) (2 diffs)
• ParallelSubScopesProcessor.cs (deleted)
• SubScopesProcessor.cs (moved) (moved from trunk/sources/HeuristicLab.Operators/3.3/SequentialSubScopesProcessor.cs) (1 diff)
• UniformParallelSubScopesProcessor.cs (deleted)
• UniformSubScopesProcessor.cs (moved) (moved from trunk/sources/HeuristicLab.Operators/3.3/UniformSequentialSubScopesProcessor.cs) (2 diffs)

trunk/sources/HeuristicLab.Operators/3.3/HeuristicLab.Operators-3.3.csproj

@@ -94 +94 @@
     <Compile Include="MultipleCallsOperator.cs" />
     <Compile Include="Operator.cs" />
-    <Compile Include="ParallelSubScopesProcessor.cs" />
     <Compile Include="Placeholder.cs" />
     <Compile Include="IntCounter.cs" />
     <Compile Include="ScopeCleaner.cs" />
-    <Compile Include="SequentialSubScopesProcessor.cs" />
     <Compile Include="StochasticBranch.cs" />
     <Compile Include="SubScopesCreator.cs" />
+    <Compile Include="SubScopesProcessor.cs" />
     <Compile Include="SubScopesRemover.cs" />
     <Compile Include="SubScopesSorter.cs" />
     <Compile Include="DoubleCounter.cs" />
-    <Compile Include="UniformParallelSubScopesProcessor.cs" />
-    <Compile Include="UniformSequentialSubScopesProcessor.cs" />
     <Compile Include="EmptyOperator.cs">
       <SubType>Code</SubType>
@@ -112 +109 @@
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="SingleSuccessorOperator.cs" />
+    <Compile Include="UniformSubScopesProcessor.cs" />
     <Compile Include="ValuesCollector.cs" />
     <Compile Include="VariableCreator.cs" />

trunk/sources/HeuristicLab.Operators/3.3/SubScopesProcessor.cs

@@ -21 +21 @@
 
 using HeuristicLab.Core;
+using HeuristicLab.Data;
+using HeuristicLab.Parameters;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 
 namespace HeuristicLab.Operators {
   /// <summary>
-  /// An operator which contains multiple operators of which each is applied sequentially on one sub-scope of the current scope. The first operator is applied on the first sub-scope, the second on the second, and so on.
+  /// An operator which contains multiple operators of which each is applied on one sub-scope of the current scope. The first operator is applied on the first sub-scope, the second on the second, and so on.
   /// </summary>
-  [Item("SequentialSubScopesProcessor", "An operator which contains multiple operators of which each is applied sequentially on one sub-scope of the current scope. The first operator is applied on the first sub-scope, the second on the second, and so on.")]
+  [Item("SubScopesProcessor", "An operator which contains multiple operators of which each is applied on one sub-scope of the current scope. The first operator is applied on the first sub-scope, the second on the second, and so on.")]
   [StorableClass]
-  public sealed class SequentialSubScopesProcessor : MultipleCallsOperator {
-    public SequentialSubScopesProcessor()
+  public sealed class SubScopesProcessor : MultipleCallsOperator {
+    public ValueLookupParameter<BoolValue> ParallelParameter {
+      get { return (ValueLookupParameter<BoolValue>)Parameters["Parallel"]; }
+    }
+
+    public BoolValue Parallel {
+      get { return ParallelParameter.Value; }
+      set { ParallelParameter.Value = value; }
+    }
+
+    public SubScopesProcessor()
       : base() {
+      Parameters.Add(new ValueLookupParameter<BoolValue>("Parallel", "True if the operators should be applied in parallel on the sub-scopes, otherwise false.", new BoolValue(false)));
     }
 
     public override IOperation Apply() {
+      BoolValue parallel = ParallelParameter.ActualValue;
       OperationCollection next = new OperationCollection(base.Apply());
       if (Operators.Count > 0) {
         OperationCollection inner = new OperationCollection();
+        inner.Parallel = parallel == null ? false : parallel.Value;
         for (int i = 0; (i < ExecutionContext.Scope.SubScopes.Count) && (i < Operators.Count); i++)
           if (Operators[i] != null) inner.Add(ExecutionContext.CreateOperation(Operators[i], ExecutionContext.Scope.SubScopes[i]));

trunk/sources/HeuristicLab.Operators/3.3/UniformSubScopesProcessor.cs

@@ -21 +21 @@
 
 using HeuristicLab.Core;
+using HeuristicLab.Data;
 using HeuristicLab.Parameters;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
@@ -26 +27 @@
 namespace HeuristicLab.Operators {
   /// <summary>
-  /// An operator which applies a specified operator sequentially on all sub-scopes of the current scope.
+  /// An operator which applies a specified operator on all sub-scopes of the current scope.
   /// </summary>
-  [Item("UniformSequentialSubScopesProcessor", "An operator which applies a specified operator sequentially on all sub-scopes of the current scope.")]
+  [Item("UniformSubScopesProcessor", "An operator which applies a specified operator on all sub-scopes of the current scope.")]
   [StorableClass]
-  public sealed class UniformSequentialSubScopesProcessor : SingleSuccessorOperator {
+  public sealed class UniformSubScopesProcessor : SingleSuccessorOperator {
     private OperatorParameter OperatorParameter {
       get { return (OperatorParameter)Parameters["Operator"]; }
     }
+    public ValueLookupParameter<BoolValue> ParallelParameter {
+      get { return (ValueLookupParameter<BoolValue>)Parameters["Parallel"]; }
+    }
+
     public IOperator Operator {
       get { return OperatorParameter.Value; }
       set { OperatorParameter.Value = value; }
     }
+    public BoolValue Parallel {
+      get { return ParallelParameter.Value; }
+      set { ParallelParameter.Value = value; }
+    }
 
-    public UniformSequentialSubScopesProcessor()
+    public UniformSubScopesProcessor()
       : base() {
-      Parameters.Add(new OperatorParameter("Operator", "The operator which should be applied sequentially on all sub-scopes of the current scope."));
+      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)));
     }
 
     public override IOperation Apply() {
+      BoolValue parallel = ParallelParameter.ActualValue;
       OperationCollection next = new OperationCollection(base.Apply());
       if (Operator != null) {
         OperationCollection inner = new OperationCollection();
+        inner.Parallel = parallel == null ? false : parallel.Value;
         for (int i = 0; i < ExecutionContext.Scope.SubScopes.Count; i++)
           inner.Add(ExecutionContext.CreateOperation(Operator, ExecutionContext.Scope.SubScopes[i]));