Changeset 2757 for trunk/sources/HeuristicLab.Core

Timestamp:

02/08/10 03:43:36 (15 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) (5 diffs)
• HeuristicLab.Core-3.3.csproj (modified) (1 diff)
• Interfaces/IExecutionContext.cs (added)
• Interfaces/IOperator.cs (modified) (1 diff)
• Interfaces/IParameter.cs (modified) (1 diff)
• ItemArray.cs (modified) (1 diff)

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

@@ -93 +93 @@
     /// </summary>
     [Storable]
-    private Stack<ExecutionContext> executionStack;
+    private Stack<IExecutionContext> executionStack;
     /// <summary>
     /// Gets the current execution stack.
     /// </summary>
-    protected Stack<ExecutionContext> ExecutionStack {
+    protected Stack<IExecutionContext> ExecutionStack {
       get { return executionStack; }
     }
@@ -135 +135 @@
     protected Engine() {
       globalScope = new Scope("Global");
-      executionStack = new Stack<ExecutionContext>();
+      executionStack = new Stack<IExecutionContext>();
       OperatorGraph = new OperatorGraph();
     }
@@ -151 +151 @@
       clone.globalScope = (Scope)cloner.Clone(globalScope);
       clone.executionTime = executionTime;
-      ExecutionContext[] contexts = executionStack.ToArray();
+      IExecutionContext[] contexts = executionStack.ToArray();
       for (int i = contexts.Length - 1; i >= 0; i--)
-        clone.executionStack.Push((ExecutionContext)cloner.Clone(contexts[i]));
+        clone.executionStack.Push((IExecutionContext)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 {
+  public class ExecutionContext : DeepCloneable, IExecutionContext {
     [Storable]
     private ExecutionContext parent;

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

@@ -22 +22 @@
 using System;
 using System.Collections.Generic;
+using System.Linq;
 using System.Text;
 using System.Xml;
@@ -27 +28 @@
 
 namespace HeuristicLab.Core {
-  public class ExecutionContextCollection : DeepCloneable, IList<ExecutionContext> {
+  public class ExecutionContextCollection : DeepCloneable, IList<IExecutionContext>, IExecutionContext {
     [Storable]
-    private IList<ExecutionContext> contexts;
+    private IList<IExecutionContext> contexts;
 
     [Storable]
@@ -39 +40 @@
 
     public ExecutionContextCollection() {
-      contexts = new List<ExecutionContext>();
+      contexts = new List<IExecutionContext>();
       parallel = false;
     }
-    public ExecutionContextCollection(IEnumerable<ExecutionContext> collection) {
-      contexts = new List<ExecutionContext>(collection);
+    public ExecutionContextCollection(IEnumerable<IExecutionContext> collection) {
+      contexts = new List<IExecutionContext>(collection.Where(e => e != null));
       parallel = false;
     }
-    public ExecutionContextCollection(params ExecutionContext[] list) {
-      contexts = new List<ExecutionContext>(list);
+    public ExecutionContextCollection(params IExecutionContext[] list) {
+      contexts = new List<IExecutionContext>(list.Where(e => e != null));
       parallel = false;
     }
@@ -56 +57 @@
       clone.parallel = parallel;
       for (int i = 0; i < contexts.Count; i++)
-        clone.contexts.Add((ExecutionContext)cloner.Clone(contexts[i]));
+        clone.contexts.Add((IExecutionContext)cloner.Clone(contexts[i]));
       return clone;
     }
 
-    #region IList<ExecutionContext> Members
-    public int IndexOf(ExecutionContext item) {
+    #region IList<IExecutionContext> Members
+    public int IndexOf(IExecutionContext item) {
       return contexts.IndexOf(item);
     }
-    public void Insert(int index, ExecutionContext item) {
-      contexts.Insert(index, item);
+    public void Insert(int index, IExecutionContext item) {
+      if (item != null) contexts.Insert(index, item);
     }
     public void RemoveAt(int index) {
       contexts.RemoveAt(index);
     }
-    public ExecutionContext this[int index] {
+    public IExecutionContext this[int index] {
       get { return contexts[index]; }
-      set { contexts[index] = value; }
+      set { if (value != null) contexts[index] = value; }
     }
     #endregion
 
-    #region ICollection<ExecutionContext> Members
-    public void Add(ExecutionContext item) {
-      contexts.Add(item);
+    #region ICollection<IExecutionContext> Members
+    public void Add(IExecutionContext item) {
+      if (item != null) contexts.Add(item);
     }
     public void Clear() {
       contexts.Clear();
     }
-    public bool Contains(ExecutionContext item) {
+    public bool Contains(IExecutionContext item) {
       return contexts.Contains(item);
     }
-    public void CopyTo(ExecutionContext[] array, int arrayIndex) {
+    public void CopyTo(IExecutionContext[] array, int arrayIndex) {
       contexts.CopyTo(array, arrayIndex);
     }
@@ -95 +96 @@
       get { return contexts.IsReadOnly; }
     }
-    public bool Remove(ExecutionContext item) {
+    public bool Remove(IExecutionContext item) {
       return contexts.Remove(item);
     }
     #endregion
 
-    #region IEnumerable<ExecutionContext> Members
-    public IEnumerator<ExecutionContext> GetEnumerator() {
+    #region IEnumerable<IExecutionContext> Members
+    public IEnumerator<IExecutionContext> 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\IValueLookupParameter.cs" />
     <Compile Include="Interfaces\IValueParameter.cs" />

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>
-    ExecutionContextCollection Execute(ExecutionContext context);
+    IExecutionContext Execute(ExecutionContext context);
     /// <summary>
     /// Aborts the current operator.

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

@@ -29 +29 @@
   public interface IParameter : INamedItem {
     Type DataType { get; }
+    IItem ActualValue { get; set; }
     ExecutionContext ExecutionContext { get; set; }
   }

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

@@ -29 +29 @@
 using HeuristicLab.Common.Resources;
 using HeuristicLab.Collections;
-
 
 namespace HeuristicLab.Core {