Changeset 2834 for trunk/sources/HeuristicLab.Operators/3.3

Timestamp:

02/19/10 06:19:16 (14 years ago)

Author:

swagner

Message:

Operator architecture refactoring (#95)

• worked on operators, engines, and optimization

Location:

trunk/sources/HeuristicLab.Operators/3.3

Files:

• AlgorithmOperator.cs (modified) (1 diff)
• Assigner.cs (modified) (1 diff)
• CombinedOperator.cs (modified) (3 diffs)
• Comparator.cs (modified) (1 diff)
• ConditionalBranch.cs (modified) (1 diff)
• DoubleCounter.cs (modified) (1 diff)
• IntCounter.cs (modified) (1 diff)
• Operator.cs (modified) (5 diffs)
• ParallelSubScopesProcessor.cs (modified) (1 diff)
• Placeholder.cs (modified) (1 diff)
• ScopeCleaner.cs (modified) (1 diff)
• SequentialSubScopesProcessor.cs (modified) (1 diff)
• SingleSuccessorOperator.cs (modified) (1 diff)
• StochasticBranch.cs (modified) (1 diff)
• SubScopesCreator.cs (modified) (1 diff)
• SubScopesRemover.cs (modified) (1 diff)
• SubScopesSorter.cs (modified) (1 diff)
• UniformParallelSubScopesProcessor.cs (modified) (1 diff)
• UniformSequentialSubScopesProcessor.cs (modified) (1 diff)
• VariableCreator.cs (modified) (1 diff)

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

@@ -50 +50 @@
     }
 
-    public override IExecutionSequence Apply() {
-      ExecutionContextCollection next = new ExecutionContextCollection(base.Apply());
+    public override IOperation Apply() {
+      OperationCollection next = new OperationCollection(base.Apply());
       if (operatorGraph.InitialOperator != null)
-        next.Insert(0, ExecutionContext.CreateChildContext(operatorGraph.InitialOperator));
+        next.Insert(0, ExecutionContext.CreateChildOperation(operatorGraph.InitialOperator));
       return next;
     }

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

@@ -45 +45 @@
     }
 
-    public override IExecutionSequence Apply() {
+    public override IOperation Apply() {
       LeftSideParameter.ActualValue = (IItem)RightSideParameter.ActualValue.Clone();
       return base.Apply();

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

@@ -20 +20 @@
 #endregion
 
-using System.Drawing;
 using HeuristicLab.Collections;
 using HeuristicLab.Core;
-using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 
 namespace HeuristicLab.Operators {
@@ -31 +29 @@
   [Item("CombinedOperator", "An operator which contains an operator graph.")]
   [Creatable("Test")]
-  public sealed class CombinedOperator : AlgorithmOperator, IOperator {
+  public sealed class CombinedOperator : AlgorithmOperator, IParameterizedItem {
     public new ParameterCollection Parameters {
       get {
@@ -37 +35 @@
       }
     }
-    IObservableKeyedCollection<string, IParameter> IOperator.Parameters {
+    IObservableKeyedCollection<string, IParameter> IParameterizedItem.Parameters {
       get { return Parameters; }
     }

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

@@ -59 +59 @@
     }
 
-    public override IExecutionSequence Apply() {
+    public override IOperation Apply() {
       IItem left = LeftSideParameter.ActualValue;
       IItem right = RightSideParameter.ActualValue;

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

@@ -58 +58 @@
     }
 
-    public override IExecutionSequence Apply() {
-      ExecutionContextCollection next = new ExecutionContextCollection(base.Apply());
+    public override IOperation Apply() {
+      OperationCollection next = new OperationCollection(base.Apply());
       if (ConditionParameter.ActualValue.Value) {
-        if (TrueBranch != null) next.Insert(0, ExecutionContext.CreateContext(TrueBranch));
+        if (TrueBranch != null) next.Insert(0, ExecutionContext.CreateOperation(TrueBranch));
       } else {
-        if (FalseBranch != null) next.Insert(0, ExecutionContext.CreateContext(FalseBranch));
+        if (FalseBranch != null) next.Insert(0, ExecutionContext.CreateOperation(FalseBranch));
       }
       return next;

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

@@ -50 +50 @@
     }
 
-    public override IExecutionSequence Apply() {
+    public override IOperation Apply() {
       if (ValueParameter.ActualValue == null) ValueParameter.ActualValue = new DoubleData();
       ValueParameter.ActualValue.Value += IncrementParameter.ActualValue.Value;

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

@@ -50 +50 @@
     }
 
-    public override IExecutionSequence Apply() {
+    public override IOperation Apply() {
       if (ValueParameter.ActualValue == null) ValueParameter.ActualValue = new IntData();
       ValueParameter.ActualValue.Value += IncrementParameter.ActualValue.Value;

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

@@ -51 +51 @@
     }
     private ReadOnlyObservableKeyedCollection<string, IParameter> readOnlyParameters;
-    IObservableKeyedCollection<string, IParameter> IOperator.Parameters {
+    IObservableKeyedCollection<string, IParameter> IParameterizedItem.Parameters {
       get {
         if (readOnlyParameters == null) readOnlyParameters = parameters.AsReadOnly();
@@ -59 +59 @@
 
     [Storable]
-    private ExecutionContext executionContext;
-    protected ExecutionContext ExecutionContext {
+    private IExecutionContext executionContext;
+    protected IExecutionContext ExecutionContext {
       get { return executionContext; }
       private set {
@@ -122 +122 @@
       clone.canceled = canceled;
       clone.breakpoint = breakpoint;
-      clone.executionContext = (ExecutionContext)cloner.Clone(executionContext);
+      clone.executionContext = (IExecutionContext)cloner.Clone(executionContext);
       return clone;
     }
 
     /// <inheritdoc/>
-    public virtual IExecutionSequence Execute(ExecutionContext context) {
+    public virtual IOperation Execute(IExecutionContext context) {
       try {
         Canceled = false;
@@ -133 +133 @@
         foreach (IParameter param in Parameters)
           param.ExecutionContext = context;
-        IExecutionSequence next = Apply();
+        IOperation next = Apply();
         OnExecuted();
         return next;
@@ -153 +153 @@
     /// <param name="scope">The scope where to execute the operator</param>
     /// <returns><c>null</c>.</returns>
-    public abstract IExecutionSequence Apply();
+    public abstract IOperation Apply();
 
     protected virtual void OnExecutionContextChanged() { }

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

@@ -33 +33 @@
     }
 
-    public override IExecutionSequence Apply() {
-      ExecutionContextCollection next = new ExecutionContextCollection(base.Apply());
+    public override IOperation Apply() {
+      OperationCollection next = new OperationCollection(base.Apply());
       if (Operators.Count > 0) {
-        ExecutionContextCollection inner = new ExecutionContextCollection();
+        OperationCollection inner = new OperationCollection();
         inner.Parallel = true;
         for (int i = 0; (i < ExecutionContext.Scope.SubScopes.Count) && (i < Operators.Count); i++)
-          if (Operators[i] != null) inner.Add(ExecutionContext.CreateContext(Operators[i], ExecutionContext.Scope.SubScopes[i]));
+          if (Operators[i] != null) inner.Add(ExecutionContext.CreateOperation(Operators[i], ExecutionContext.Scope.SubScopes[i]));
         next.Insert(0, inner);
       }

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

@@ -41 +41 @@
     }
 
-    public override IExecutionSequence Apply() {
-      ExecutionContextCollection next = new ExecutionContextCollection(base.Apply());
+    public override IOperation Apply() {
+      OperationCollection next = new OperationCollection(base.Apply());
       IOperator op = OperatorParameter.ActualValue;
       if (op != null)
-        next.Insert(0, ExecutionContext.CreateContext(op));
+        next.Insert(0, ExecutionContext.CreateOperation(op));
       return next;
     }

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

@@ -44 +44 @@
     }
 
-    public override IExecutionSequence Apply() {
+    public override IOperation Apply() {
       CurrentScope.Variables.Clear();
       CurrentScope.SubScopes.Clear();

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

@@ -33 +33 @@
     }
 
-    public override IExecutionSequence Apply() {
-      ExecutionContextCollection next = new ExecutionContextCollection(base.Apply());
+    public override IOperation Apply() {
+      OperationCollection next = new OperationCollection(base.Apply());
       if (Operators.Count > 0) {
-        ExecutionContextCollection inner = new ExecutionContextCollection();
+        OperationCollection inner = new OperationCollection();
         for (int i = 0; (i < ExecutionContext.Scope.SubScopes.Count) && (i < Operators.Count); i++)
-          if (Operators[i] != null) inner.Add(ExecutionContext.CreateContext(Operators[i], ExecutionContext.Scope.SubScopes[i]));
+          if (Operators[i] != null) inner.Add(ExecutionContext.CreateOperation(Operators[i], ExecutionContext.Scope.SubScopes[i]));
         next.Insert(0, inner);
       }

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

@@ -45 +45 @@
     }
 
-    public override IExecutionSequence Apply() {
+    public override IOperation Apply() {
       if (Successor != null)
-        return ExecutionContext.CreateContext(Successor);
+        return ExecutionContext.CreateOperation(Successor);
       else
         return null;

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

@@ -62 +62 @@
     }
 
-    public override IExecutionSequence Apply() {
-      ExecutionContextCollection next = new ExecutionContextCollection(base.Apply());
+    public override IOperation Apply() {
+      OperationCollection next = new OperationCollection(base.Apply());
       if (RandomParameter.ActualValue.NextDouble() < ProbabilityParameter.ActualValue.Value) {
-        if (FirstBranch != null) next.Insert(0, ExecutionContext.CreateContext(FirstBranch));
+        if (FirstBranch != null) next.Insert(0, ExecutionContext.CreateOperation(FirstBranch));
       } else {
-        if (SecondBranch != null) next.Insert(0, ExecutionContext.CreateContext(SecondBranch));
+        if (SecondBranch != null) next.Insert(0, ExecutionContext.CreateOperation(SecondBranch));
       }
       return next;

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

@@ -49 +49 @@
     }
 
-    public override IExecutionSequence Apply() {
+    public override IOperation Apply() {
       int n = NumberOfSubScopesParameter.ActualValue.Value;
       for (int i = 0; i < n; i++)

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

@@ -58 +58 @@
     }
 
-    public override IExecutionSequence Apply() {
+    public override IOperation Apply() {
       if (RemoveAllSubScopes)
         CurrentScope.SubScopes.Clear();

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

@@ -56 +56 @@
     }
 
-    public override IExecutionSequence Apply() {
+    public override IOperation Apply() {
       descending = DescendingParameter.ActualValue.Value;
       actualName = LookupParameter<ItemArray<DoubleData>>.TranslateName(ValueParameter.Name, ExecutionContext);

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

@@ -45 +45 @@
     }
 
-    public override IExecutionSequence Apply() {
-      ExecutionContextCollection next = new ExecutionContextCollection(base.Apply());
+    public override IOperation Apply() {
+      OperationCollection next = new OperationCollection(base.Apply());
       if (Operator != null) {
-        ExecutionContextCollection inner = new ExecutionContextCollection();
+        OperationCollection inner = new OperationCollection();
         inner.Parallel = true;
         for (int i = 0; i < ExecutionContext.Scope.SubScopes.Count; i++)
-          inner.Add(ExecutionContext.CreateContext(Operator, ExecutionContext.Scope.SubScopes[i]));
+          inner.Add(ExecutionContext.CreateOperation(Operator, ExecutionContext.Scope.SubScopes[i]));
         next.Insert(0, inner);
       }

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

@@ -45 +45 @@
     }
 
-    public override IExecutionSequence Apply() {
-      ExecutionContextCollection next = new ExecutionContextCollection(base.Apply());
+    public override IOperation Apply() {
+      OperationCollection next = new OperationCollection(base.Apply());
       if (Operator != null) {
-        ExecutionContextCollection inner = new ExecutionContextCollection();
+        OperationCollection inner = new OperationCollection();
         for (int i = 0; i < ExecutionContext.Scope.SubScopes.Count; i++)
-          inner.Add(ExecutionContext.CreateContext(Operator, ExecutionContext.Scope.SubScopes[i]));
+          inner.Add(ExecutionContext.CreateOperation(Operator, ExecutionContext.Scope.SubScopes[i]));
         next.Insert(0, inner);
       }

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

@@ -44 +44 @@
     }
 
-    public override IExecutionSequence Apply() {
+    public override IOperation Apply() {
       IVariable var;
       foreach (IParameter param in CollectedValues) {