Changeset 8155 for trunk/sources/HeuristicLab.Optimization

Timestamp:

06/28/12 17:39:55 (12 years ago)

Author:

gkronber

Message:

#1875 set the ExecutionState to stopped only after all results have been generated. This mitigates the problem of the race condition in CrossValidation even though the underlying problem is not actually solved.

File:

• trunk/sources/HeuristicLab.Optimization/3.3/Algorithms/Algorithm.cs (modified) (3 diffs)

trunk/sources/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);