Changeset 2916 for trunk/sources/HeuristicLab.Core/3.3/Engine.cs

Timestamp:

03/03/10 03:14:37 (14 years ago)

Author:

swagner

Message:

Operator architecture refactoring (#95)

• worked on engines and algorithms

File:

• trunk/sources/HeuristicLab.Core/3.3/Engine.cs (modified) (6 diffs)

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

@@ -39 +39 @@
     }
 
-    private OperatorGraph operatorGraph;
-    /// <summary>
-    /// Gets or sets the current operator graph.
-    /// </summary>
-    [Storable]
-    public OperatorGraph OperatorGraph {
-      get { return operatorGraph; }
-      set {
-        if (value == null) throw new ArgumentNullException();
-        if (value != operatorGraph) {
-          if (operatorGraph != null) operatorGraph.InitialOperatorChanged -= new EventHandler(operatorGraph_InitialOperatorChanged);
-          operatorGraph = value;
-          if (operatorGraph != null) operatorGraph.InitialOperatorChanged += new EventHandler(operatorGraph_InitialOperatorChanged);
-          OnOperatorGraphChanged();
-          Prepare();
-        }
-      }
-    }
-
-    /// <summary>
-    /// Field of the current instance that represent the global scope.
-    /// </summary>
-    [Storable]
-    private IScope globalScope;
-    /// <summary>
-    /// Gets the current global scope.
-    /// </summary>
-    public IScope GlobalScope {
-      get { return globalScope; }
-    }
-
     [Storable]
     private TimeSpan executionTime;
@@ -134 +103 @@
     /// </summary>
     protected Engine() {
-      globalScope = new Scope("Global");
       executionStack = new Stack<IOperation>();
-      OperatorGraph = new OperatorGraph();
     }
 
@@ -148 +115 @@
     public override IDeepCloneable Clone(Cloner cloner) {
       Engine clone = (Engine)base.Clone(cloner);
-      clone.OperatorGraph = (OperatorGraph)cloner.Clone(operatorGraph);
-      clone.globalScope = (Scope)cloner.Clone(globalScope);
       clone.executionTime = executionTime;
       IOperation[] contexts = executionStack.ToArray();
@@ -162 +127 @@
       Canceled = false;
       running = false;
-      globalScope.Clear();
       ExecutionTime = new TimeSpan();
       executionStack.Clear();
@@ -168 +132 @@
         executionStack.Push(initialOperation);
       OnPrepared();
-    }
-    /// <inheritdoc/>
-    /// <remarks>Sets <c>myCanceled</c> and <c>myRunning</c> to <c>false</c>. The global scope is cleared,
-    /// the execution time is reset, the execution stack is cleared and a new <see cref="AtomicOperation"/>
-    /// with the initial operator is added. <br/>
-    /// Calls <see cref="OnPrepared"/>.</remarks>
-    public void Prepare() {
-      if (OperatorGraph.InitialOperator != null)
-        Prepare(new ExecutionContext(null, OperatorGraph.InitialOperator, GlobalScope));
     }
     /// <inheritdoc/>
@@ -229 +184 @@
     protected abstract void ProcessNextOperator();
 
-    private void operatorGraph_InitialOperatorChanged(object sender, EventArgs e) {
-      Prepare();
-    }
-
-    /// <summary>
-    /// Occurs when the operator graph was changed.
-    /// </summary>
-    public event EventHandler OperatorGraphChanged;
-    /// <summary>
-    /// Fires a new <c>OperatorGraphChanged</c> event.
-    /// </summary>
-    protected virtual void OnOperatorGraphChanged() {
-      if (OperatorGraphChanged != null)
-        OperatorGraphChanged(this, EventArgs.Empty);
-    }
     /// <summary>
     /// Occurs when the execution time changed.