Changeset 2818 for trunk/sources/HeuristicLab.Operators

Timestamp:

02/17/10 05:24:03 (15 years ago)

Author:

swagner

Message:

Operator architecture refactoring (#95)

• corrected several bugs in order to get SGA working

Location:

trunk/sources/HeuristicLab.Operators/3.3

Files:

• HeuristicLab.Operators-3.3.csproj (modified) (1 diff)
• MultipleCallsOperator.cs (modified) (2 diffs)
• SingleCallOperator.cs (deleted)
• SubScopesSorter.cs (modified) (2 diffs)
• UniformParallelSubScopesProcessor.cs (modified) (1 diff)
• UniformSequentialSubScopesProcessor.cs (modified) (1 diff)

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

@@ -94 +94 @@
     <Compile Include="ParallelSubScopesProcessor.cs" />
     <Compile Include="Placeholder.cs" />
-    <Compile Include="SingleCallOperator.cs" />
     <Compile Include="IntCounter.cs" />
     <Compile Include="ScopeCleaner.cs" />

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

@@ -29 +29 @@
 namespace HeuristicLab.Operators {
   /// <summary>
-  /// An operator which applies multiple operators sequentially on the current scope.
+  /// A base class for operators which apply multiple user-defined operators.
   /// </summary>
-  [Item("MultipleCallsOperator", "An operator which applies multiple operators sequentially on the current scope.")]
-  [Creatable("Test")]
-  public class MultipleCallsOperator : SingleSuccessorOperator {
+  [Item("MultipleCallsOperator", "A base class for operators which apply multiple user-defined operators.")]
+  public abstract class MultipleCallsOperator : SingleSuccessorOperator {
     protected IValueParameter<IOperator>[] OperatorParameters {
       get {
@@ -106 +105 @@
       operators[index] = opParam.Value;
     }
-
-    public override IExecutionSequence Apply() {
-      ExecutionContextCollection next = new ExecutionContextCollection(base.Apply());
-      for (int i = Operators.Count - 1; i >= 0; i--)
-        next.Insert(0, ExecutionContext.CreateContext(Operators[i]));
-      return next;
-    }
   }
 }

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

@@ -58 +58 @@
     public override IExecutionSequence Apply() {
       descending = DescendingParameter.ActualValue.Value;
-      actualName = LookupParameter<DoubleData>.TranslateName(ValueParameter.Name, ExecutionContext);
+      actualName = LookupParameter<ItemArray<DoubleData>>.TranslateName(ValueParameter.Name, ExecutionContext);
       CurrentScope.SubScopes.Sort(SortScopes);
       return base.Apply();
@@ -67 +67 @@
       IVariable var2;
       x.Variables.TryGetValue(actualName, out var1);
-      x.Variables.TryGetValue(actualName, out var2);
+      y.Variables.TryGetValue(actualName, out var2);
       if ((var1 == null) && (var2 == null))
         return 0;

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

@@ -31 +31 @@
   [Creatable("Test")]
   [EmptyStorableClass]
-  public sealed class UniformParallelSubScopesProcessor : SingleCallOperator {
+  public sealed class UniformParallelSubScopesProcessor : SingleSuccessorOperator {
+    private OperatorParameter OperatorParameter {
+      get { return (OperatorParameter)Parameters["Operator"]; }
+    }
+    public IOperator Operator {
+      get { return OperatorParameter.Value; }
+      set { OperatorParameter.Value = value; }
+    }
+
     public UniformParallelSubScopesProcessor()
       : base() {
-      Parameters.Remove("Operator");
       Parameters.Add(new OperatorParameter("Operator", "The operator which should be applied on all sub-scopes of the current scope in parallel."));
     }

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

@@ -31 +31 @@
   [Creatable("Test")]
   [EmptyStorableClass]
-  public sealed class UniformSequentialSubScopesProcessor : SingleCallOperator {
+  public sealed class UniformSequentialSubScopesProcessor : SingleSuccessorOperator {
+    private OperatorParameter OperatorParameter {
+      get { return (OperatorParameter)Parameters["Operator"]; }
+    }
+    public IOperator Operator {
+      get { return OperatorParameter.Value; }
+      set { OperatorParameter.Value = value; }
+    }
+
     public UniformSequentialSubScopesProcessor()
       : base() {
-      Parameters.Remove("Operator");
       Parameters.Add(new OperatorParameter("Operator", "The operator which should be applied sequentially on all sub-scopes of the current scope."));
     }