Changeset 8206 for branches/GP-MoveOperators/HeuristicLab.Optimization/3.3/Algorithms/Algorithm.cs

Timestamp:

07/03/12 16:46:35 (12 years ago)

Author:

gkronber

Message:

#1847: merged r8084:8205 from trunk into GP move operators branch

Location:

branches/GP-MoveOperators

Files:

• . (modified) (1 prop)
• HeuristicLab.Optimization/3.3/Algorithms/Algorithm.cs (modified) (3 diffs)

branches/GP-MoveOperators/HeuristicLab.Optimization/3.3/Algorithms/Algorithm.cs

@@ -272 +272 @@
     public event EventHandler Prepared;
     protected virtual void OnPrepared() {
-      ExecutionState = ExecutionState.Prepared;
       ExecutionTime = TimeSpan.Zero;
       foreach (IStatefulItem statefulObject in this.GetObjectGraphObjects(new HashSet<string>() { "runs" }).OfType<IStatefulItem>()) {
         statefulObject.InitializeState();
       }
+      ExecutionState = ExecutionState.Prepared;
       EventHandler handler = Prepared;
       if (handler != null) handler(this, EventArgs.Empty);
@@ -294 +294 @@
     public event EventHandler Stopped;
     protected virtual void OnStopped() {
-      ExecutionState = ExecutionState.Stopped;
       foreach (IStatefulItem statefulObject in this.GetObjectGraphObjects(new HashSet<string>() { "runs" }).OfType<IStatefulItem>()) {
         statefulObject.ClearState();
@@ -300 +299 @@
       runsCounter++;
       runs.Add(new Run(string.Format("{0} Run {1}", Name, runsCounter), this));
+      ExecutionState = ExecutionState.Stopped;
       EventHandler handler = Stopped;
       if (handler != null) handler(this, EventArgs.Empty);