Changeset 2796 for trunk/sources/HeuristicLab.Operators

Timestamp:

02/15/10 05:26:02 (15 years ago)

Author:

swagner

Message:

Operator architecture refactoring (#95)

• worked on operators, parameters and problems

Location:

trunk/sources/HeuristicLab.Operators/3.3

Files:

• CombinedOperator.cs (modified) (1 diff)
• ConditionalBranch.cs (modified) (1 diff)
• HeuristicLab.Operators-3.3.csproj (modified) (1 diff)
• MultipleCallsOperator.cs (modified) (1 diff)
• ParallelSubScopesProcessor.cs (modified) (1 diff)
• Placeholder.cs (modified) (1 diff)
• SequentialSubScopesProcessor.cs (modified) (1 diff)
• SingleCallOperator.cs (modified) (1 diff)
• SingleSuccessorOperator.cs (modified) (1 diff)
• StochasticBranch.cs (modified) (1 diff)
• UniformParallelSubScopesProcessor.cs (modified) (1 diff)
• UniformSequentialSubScopesProcessor.cs (modified) (1 diff)

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

@@ -66 +66 @@
       ExecutionContextCollection next = new ExecutionContextCollection(base.Apply());
       if (operatorGraph.InitialOperator != null)
-        next.Insert(0, new ExecutionContext(ExecutionContext, operatorGraph.InitialOperator, ExecutionContext.Scope));
+        next.Insert(0, ExecutionContext.CreateChildContext(operatorGraph.InitialOperator));
       return next;
     }

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

@@ -61 +61 @@
       ExecutionContextCollection next = new ExecutionContextCollection(base.Apply());
       if (ConditionParameter.ActualValue.Value) {
-        if (TrueBranch != null) next.Insert(0, new ExecutionContext(ExecutionContext.Parent, TrueBranch, ExecutionContext.Scope));
+        if (TrueBranch != null) next.Insert(0, ExecutionContext.CreateContext(TrueBranch));
       } else {
-        if (FalseBranch != null) next.Insert(0, new ExecutionContext(ExecutionContext.Parent, FalseBranch, ExecutionContext.Scope));
+        if (FalseBranch != null) next.Insert(0, ExecutionContext.CreateContext(FalseBranch));
       }
       return next;

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

@@ -108 +108 @@
     </Compile>
     <Compile Include="HeuristicLabOperatorsPlugin.cs" />
-    <Compile Include="Operator.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="SingleSuccessorOperator.cs" />

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

@@ -110 +110 @@
       ExecutionContextCollection next = new ExecutionContextCollection(base.Apply());
       for (int i = Operators.Count - 1; i >= 0; i--)
-        next.Insert(0, new ExecutionContext(ExecutionContext.Parent, Operators[i], ExecutionContext.Scope));
+        next.Insert(0, ExecutionContext.CreateContext(Operators[i]));
       return next;
     }

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

@@ -39 +39 @@
         inner.Parallel = true;
         for (int i = 0; (i < ExecutionContext.Scope.SubScopes.Count) && (i < Operators.Count); i++)
-          inner.Add(new ExecutionContext(ExecutionContext.Parent, Operators[i], ExecutionContext.Scope.SubScopes[i]));
+          inner.Add(ExecutionContext.CreateContext(Operators[i], ExecutionContext.Scope.SubScopes[i]));
         next.Insert(0, inner);
       }

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

@@ -45 +45 @@
       IOperator op = OperatorParameter.ActualValue;
       if (op != null)
-        next.Insert(0, new ExecutionContext(ExecutionContext.Parent, op, ExecutionContext.Scope));
+        next.Insert(0, ExecutionContext.CreateContext(op));
       return next;
     }

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

@@ -38 +38 @@
         ExecutionContextCollection inner = new ExecutionContextCollection();
         for (int i = 0; (i < ExecutionContext.Scope.SubScopes.Count) && (i < Operators.Count); i++)
-          inner.Add(new ExecutionContext(ExecutionContext.Parent, Operators[i], ExecutionContext.Scope.SubScopes[i]));
+          inner.Add(ExecutionContext.CreateContext(Operators[i], ExecutionContext.Scope.SubScopes[i]));
         next.Insert(0, inner);
       }

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

@@ -48 +48 @@
       ExecutionContextCollection next = new ExecutionContextCollection(base.Apply());
       if (Operator != null)
-        next.Insert(0, new ExecutionContext(ExecutionContext.Parent, Operator, ExecutionContext.Scope));
+        next.Insert(0, ExecutionContext.CreateContext(Operator));
       return next;
     }

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

@@ -47 +47 @@
     public override IExecutionSequence Apply() {
       if (Successor != null)
-        return new ExecutionContext(ExecutionContext.Parent, Successor, ExecutionContext.Scope);
+        return ExecutionContext.CreateContext(Successor);
       else
         return null;

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

@@ -65 +65 @@
       ExecutionContextCollection next = new ExecutionContextCollection(base.Apply());
       if (RandomParameter.ActualValue.NextDouble() < ProbabilityParameter.ActualValue.Value) {
-        if (FirstBranch != null) next.Insert(0, new ExecutionContext(ExecutionContext.Parent, FirstBranch, ExecutionContext.Scope));
+        if (FirstBranch != null) next.Insert(0, ExecutionContext.CreateContext(FirstBranch));
       } else {
-        if (SecondBranch != null) next.Insert(0, new ExecutionContext(ExecutionContext.Parent, SecondBranch, ExecutionContext.Scope));
+        if (SecondBranch != null) next.Insert(0, ExecutionContext.CreateContext(SecondBranch));
       }
       return next;

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

@@ -44 +44 @@
         inner.Parallel = true;
         for (int i = 0; i < ExecutionContext.Scope.SubScopes.Count; i++)
-          inner.Add(new ExecutionContext(ExecutionContext.Parent, Operator, ExecutionContext.Scope.SubScopes[i]));
+          inner.Add(ExecutionContext.CreateContext(Operator, ExecutionContext.Scope.SubScopes[i]));
         next.Insert(0, inner);
       }

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

@@ -43 +43 @@
         ExecutionContextCollection inner = new ExecutionContextCollection();
         for (int i = 0; i < ExecutionContext.Scope.SubScopes.Count; i++)
-          inner.Add(new ExecutionContext(ExecutionContext.Parent, Operator, ExecutionContext.Scope.SubScopes[i]));
+          inner.Add(ExecutionContext.CreateContext(Operator, ExecutionContext.Scope.SubScopes[i]));
         next.Insert(0, inner);
       }