Changeset 8190 for trunk/sources/HeuristicLab.Optimization/3.3/BatchRun.cs

Timestamp:

07/03/12 13:07:00 (12 years ago)

Author:

mkommend

Message:

#1783: Corrected tool tips in optimizer views and last errors in batchrun execution state handling.

File:

• trunk/sources/HeuristicLab.Optimization/3.3/BatchRun.cs (modified) (11 diffs)

trunk/sources/HeuristicLab.Optimization/3.3/BatchRun.cs

@@ -153 +153 @@
     }
 
+    private bool batchRunPrepared = false;
     private bool batchRunStarted = false;
     private bool batchRunPaused = false;
@@ -206 +207 @@
       batchRunPaused = original.batchRunPaused;
       batchRunStopped = original.batchRunStopped;
+      batchRunPrepared = original.batchRunPrepared;
       Initialize();
     }
@@ -228 +230 @@
         repetitionsCounter = 0;
         if (clearRuns) runs.Clear();
-        Optimizer.Prepare(clearRuns);
+        batchRunPrepared = true;
         batchRunStarted = false;
         batchRunPaused = false;
         batchRunStopped = false;
+        Optimizer.Prepare(clearRuns);
       } else {
         ExecutionState = ExecutionState.Stopped;
@@ -241 +244 @@
       if (Optimizer == null) return;
 
+      batchRunPrepared = false;
       batchRunStarted = true;
       batchRunPaused = false;
@@ -253 +257 @@
       if (Optimizer.ExecutionState != ExecutionState.Started) return;
 
+      batchRunPrepared = false;
       batchRunStarted = false;
       batchRunPaused = true;
@@ -262 +267 @@
         throw new InvalidOperationException(string.Format("Stop not allowed in execution state \"{0}\".", ExecutionState));
       if (Optimizer == null) return;
-      if (Optimizer.ExecutionState != ExecutionState.Started && Optimizer.ExecutionState != ExecutionState.Paused) return;
+      if (Optimizer.ExecutionState != ExecutionState.Started && Optimizer.ExecutionState != ExecutionState.Paused) {
+        OnStopped();
+        return;
+      }
+
+      batchRunPrepared = false;
       batchRunStarted = false;
       batchRunPaused = false;
@@ -292 +302 @@
     public event EventHandler Prepared;
     private void OnPrepared() {
+      batchRunPrepared = false;
       ExecutionState = ExecutionState.Prepared;
       EventHandler handler = Prepared;
@@ -298 +309 @@
     public event EventHandler Started;
     private void OnStarted() {
+      //TODO add coment
       ExecutionState = ExecutionState.Started;
       EventHandler handler = Started;
@@ -304 +316 @@
     public event EventHandler Paused;
     private void OnPaused() {
+      batchRunPaused = false;
       ExecutionState = ExecutionState.Paused;
       EventHandler handler = Paused;
@@ -310 +323 @@
     public event EventHandler Stopped;
     private void OnStopped() {
+      //reset flags because it cannot be done if the optimizer gets prepared
+      batchRunStopped = false;
       ExecutionState = ExecutionState.Stopped;
       EventHandler handler = Stopped;
@@ -354 +369 @@
     }
     private void Optimizer_Prepared(object sender, EventArgs e) {
-      if (ExecutionState == ExecutionState.Stopped || !batchRunStarted) {
+      if (batchRunPrepared || (ExecutionState == ExecutionState.Stopped)) {
         ExecutionTime = TimeSpan.Zero;
         runsExecutionTime = TimeSpan.Zero;
+        repetitionsCounter = 0;
         OnPrepared();
       }