Changeset 2773 for trunk/sources/HeuristicLab.Core

Timestamp:

02/10/10 03:39:02 (14 years ago)

Author:

swagner

Message:

Operator architecture refactoring (#95)

• worked on parameters and operators

Location:

trunk/sources/HeuristicLab.Core/3.3

Files:

• Engine.cs (modified) (3 diffs)
• ExecutionContext.cs (modified) (1 diff)
• ExecutionContextCollection.cs (modified) (8 diffs)
• HeuristicLab.Core-3.3.csproj (modified) (1 diff)
• Interfaces/IExecutionSequence.cs (moved) (moved from trunk/sources/HeuristicLab.Core/3.3/Interfaces/IExecutionContext.cs) (1 diff)
• Interfaces/IOperator.cs (modified) (1 diff)

trunk/sources/HeuristicLab.Core/3.3/Engine.cs

@@ -93 +93 @@
     /// </summary>
     [Storable]
-    private Stack<IExecutionContext> executionStack;
+    private Stack<IExecutionSequence> executionStack;
     /// <summary>
     /// Gets the current execution stack.
     /// </summary>
-    protected Stack<IExecutionContext> ExecutionStack {
+    protected Stack<IExecutionSequence> ExecutionStack {
       get { return executionStack; }
     }
@@ -135 +135 @@
     protected Engine() {
       globalScope = new Scope("Global");
-      executionStack = new Stack<IExecutionContext>();
+      executionStack = new Stack<IExecutionSequence>();
       OperatorGraph = new OperatorGraph();
     }
@@ -151 +151 @@
       clone.globalScope = (Scope)cloner.Clone(globalScope);
       clone.executionTime = executionTime;
-      IExecutionContext[] contexts = executionStack.ToArray();
+      IExecutionSequence[] contexts = executionStack.ToArray();
       for (int i = contexts.Length - 1; i >= 0; i--)
-        clone.executionStack.Push((IExecutionContext)cloner.Clone(contexts[i]));
+        clone.executionStack.Push((IExecutionSequence)cloner.Clone(contexts[i]));
       clone.running = running;
       clone.canceled = canceled;

trunk/sources/HeuristicLab.Core/3.3/ExecutionContext.cs

@@ -26 +26 @@
 
 namespace HeuristicLab.Core {
-  public class ExecutionContext : DeepCloneable, IExecutionContext {
+  public class ExecutionContext : DeepCloneable, IExecutionSequence {
     [Storable]
     private ExecutionContext parent;

trunk/sources/HeuristicLab.Core/3.3/ExecutionContextCollection.cs

@@ -28 +28 @@
 
 namespace HeuristicLab.Core {
-  public class ExecutionContextCollection : DeepCloneable, IList<IExecutionContext>, IExecutionContext {
+  public class ExecutionContextCollection : DeepCloneable, IList<IExecutionSequence>, IExecutionSequence {
     [Storable]
-    private IList<IExecutionContext> contexts;
+    private IList<IExecutionSequence> contexts;
 
     [Storable]
@@ -40 +40 @@
 
     public ExecutionContextCollection() {
-      contexts = new List<IExecutionContext>();
+      contexts = new List<IExecutionSequence>();
       parallel = false;
     }
-    public ExecutionContextCollection(IEnumerable<IExecutionContext> collection) {
-      contexts = new List<IExecutionContext>(collection.Where(e => e != null));
+    public ExecutionContextCollection(IEnumerable<IExecutionSequence> collection) {
+      contexts = new List<IExecutionSequence>(collection.Where(e => e != null));
       parallel = false;
     }
-    public ExecutionContextCollection(params IExecutionContext[] list) {
-      contexts = new List<IExecutionContext>(list.Where(e => e != null));
+    public ExecutionContextCollection(params IExecutionSequence[] list) {
+      contexts = new List<IExecutionSequence>(list.Where(e => e != null));
       parallel = false;
     }
@@ -57 +57 @@
       clone.parallel = parallel;
       for (int i = 0; i < contexts.Count; i++)
-        clone.contexts.Add((IExecutionContext)cloner.Clone(contexts[i]));
+        clone.contexts.Add((IExecutionSequence)cloner.Clone(contexts[i]));
       return clone;
     }
 
     #region IList<IExecutionContext> Members
-    public int IndexOf(IExecutionContext item) {
+    public int IndexOf(IExecutionSequence item) {
       return contexts.IndexOf(item);
     }
-    public void Insert(int index, IExecutionContext item) {
+    public void Insert(int index, IExecutionSequence item) {
       if (item != null) contexts.Insert(index, item);
     }
@@ -71 +71 @@
       contexts.RemoveAt(index);
     }
-    public IExecutionContext this[int index] {
+    public IExecutionSequence this[int index] {
       get { return contexts[index]; }
       set { if (value != null) contexts[index] = value; }
@@ -78 +78 @@
 
     #region ICollection<IExecutionContext> Members
-    public void Add(IExecutionContext item) {
+    public void Add(IExecutionSequence item) {
       if (item != null) contexts.Add(item);
     }
@@ -84 +84 @@
       contexts.Clear();
     }
-    public bool Contains(IExecutionContext item) {
+    public bool Contains(IExecutionSequence item) {
       return contexts.Contains(item);
     }
-    public void CopyTo(IExecutionContext[] array, int arrayIndex) {
+    public void CopyTo(IExecutionSequence[] array, int arrayIndex) {
       contexts.CopyTo(array, arrayIndex);
     }
@@ -96 +96 @@
       get { return contexts.IsReadOnly; }
     }
-    public bool Remove(IExecutionContext item) {
+    public bool Remove(IExecutionSequence item) {
       return contexts.Remove(item);
     }
@@ -102 +102 @@
 
     #region IEnumerable<IExecutionContext> Members
-    public IEnumerator<IExecutionContext> GetEnumerator() {
+    public IEnumerator<IExecutionSequence> GetEnumerator() {
       return contexts.GetEnumerator();
     }

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

@@ -104 +104 @@
     <Compile Include="ChangedEventArgs.cs" />
     <None Include="HeuristicLabCorePlugin.cs.frame" />
-    <Compile Include="Interfaces\IExecutionContext.cs" />
+    <Compile Include="Interfaces\IExecutionSequence.cs" />
     <Compile Include="Interfaces\IValueLookupParameter.cs" />
     <Compile Include="Interfaces\IValueParameter.cs" />

trunk/sources/HeuristicLab.Core/3.3/Interfaces/IExecutionSequence.cs

@@ -30 +30 @@
   /// Interface which represents an execution context.
   /// </summary>
-  public interface IExecutionContext : IDeepCloneable { }
+  public interface IExecutionSequence : IDeepCloneable { }
 }

trunk/sources/HeuristicLab.Core/3.3/Interfaces/IOperator.cs

@@ -44 +44 @@
     /// <param name="scope">The scope where to execute the current instance.</param>
     /// <returns>The next operation.</returns>
-    IExecutionContext Execute(ExecutionContext context);
+    IExecutionSequence Execute(ExecutionContext context);
     /// <summary>
     /// Aborts the current operator.