Changeset 8975

Timestamp:

11/29/12 11:31:44 (12 years ago)

Author:

abeham

Message:

#1985:

• Moved arithmetic progression dialog to MainForm (created a folder dialogs)
• Added a button to generate such a progression for snapshot times
• Changed TimeLimitRun to react on ExecutionTimeChanged instead of maintaining its own timers
• Changed to allow manual snapshoting only during Paused state
• Perform a pause + snapshot when terminating the algorithm instead of stop + snapshot (allows the algorithm in the final snapshot to continue running if the option was selected)

Location:

branches/RuntimeOptimizer

Files:

• HeuristicLab.MainForm.WindowsForms/3.3/Dialogs (added)
• HeuristicLab.MainForm.WindowsForms/3.3/Dialogs/DefineArithmeticProgressionDialog.Designer.cs (added)
• HeuristicLab.MainForm.WindowsForms/3.3/Dialogs/DefineArithmeticProgressionDialog.cs (added)
• HeuristicLab.MainForm.WindowsForms/3.3/HeuristicLab.MainForm.WindowsForms-3.3.csproj (modified) (2 diffs)
• HeuristicLab.Optimization.Views/3.3/TimeLimitRunView.Designer.cs (modified) (5 diffs)
• HeuristicLab.Optimization.Views/3.3/TimeLimitRunView.cs (modified) (2 diffs)
• HeuristicLab.Optimization/3.3/MetaOptimizers/BatchRun.cs (modified) (8 diffs)
• HeuristicLab.Optimization/3.3/MetaOptimizers/Experiment.cs (modified) (8 diffs)
• HeuristicLab.Optimization/3.3/MetaOptimizers/TimeLimitRun.cs (modified) (13 diffs)
• HeuristicLab.Optimizer/3.3/CreateExperimentDialog.cs (modified) (1 diff)
• HeuristicLab.Optimizer/3.3/DefineArithmeticProgressionDialog.Designer.cs (deleted)
• HeuristicLab.Optimizer/3.3/DefineArithmeticProgressionDialog.cs (deleted)
• HeuristicLab.Optimizer/3.3/HeuristicLab.Optimizer-3.3.csproj (modified) (1 diff)

branches/RuntimeOptimizer/HeuristicLab.MainForm.WindowsForms/3.3/HeuristicLab.MainForm.WindowsForms-3.3.csproj

@@ -126 +126 @@
       <DependentUpon>DragOverTabControl.cs</DependentUpon>
     </Compile>
+    <Compile Include="Dialogs\DefineArithmeticProgressionDialog.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="Dialogs\DefineArithmeticProgressionDialog.Designer.cs">
+      <DependentUpon>DefineArithmeticProgressionDialog.cs</DependentUpon>
+    </Compile>
     <Compile Include="Plugin.cs" />
     <Compile Include="Views\AsynchronousContentView.cs">
@@ -254 +260 @@
     </BootstrapperPackage>
   </ItemGroup>
+  <ItemGroup />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 

branches/RuntimeOptimizer/HeuristicLab.Optimization.Views/3.3/TimeLimitRunView.Designer.cs

@@ -51 +51 @@
       this.openFileDialog = new System.Windows.Forms.OpenFileDialog();
       this.snapshotButton = new System.Windows.Forms.Button();
+      this.sequenceButton = new System.Windows.Forms.Button();
       ((System.ComponentModel.ISupportInitialize)(this.errorProvider)).BeginInit();
       this.tabControl.SuspendLayout();
@@ -135 +136 @@
       this.snapshotsTextBox.Location = new System.Drawing.Point(69, 52);
       this.snapshotsTextBox.Name = "snapshotsTextBox";
-      this.snapshotsTextBox.Size = new System.Drawing.Size(259, 20);
+      this.snapshotsTextBox.Size = new System.Drawing.Size(175, 20);
       this.snapshotsTextBox.TabIndex = 6;
       this.snapshotsTextBox.Validating += new System.ComponentModel.CancelEventHandler(this.snapshotsTextBox_Validating);
@@ -286 +287 @@
       this.snapshotButton.Click += new System.EventHandler(this.snapshotButton_Click);
       // 
+      // sequenceButton
+      // 
+      this.sequenceButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+      this.sequenceButton.Location = new System.Drawing.Point(250, 50);
+      this.sequenceButton.Name = "sequenceButton";
+      this.sequenceButton.Size = new System.Drawing.Size(75, 23);
+      this.sequenceButton.TabIndex = 16;
+      this.sequenceButton.Text = "Sequence...";
+      this.sequenceButton.UseVisualStyleBackColor = true;
+      this.sequenceButton.Click += new System.EventHandler(this.sequenceButton_Click);
+      // 
       // TimeLimitRunView
       // 
       this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit;
+      this.Controls.Add(this.sequenceButton);
       this.Controls.Add(this.snapshotButton);
       this.Controls.Add(this.tabControl);
@@ -314 +327 @@
       this.Controls.SetChildIndex(this.startButton, 0);
       this.Controls.SetChildIndex(this.snapshotButton, 0);
+      this.Controls.SetChildIndex(this.sequenceButton, 0);
       ((System.ComponentModel.ISupportInitialize)(this.errorProvider)).EndInit();
       this.tabControl.ResumeLayout(false);
@@ -342 +356 @@
     private System.Windows.Forms.OpenFileDialog openFileDialog;
     private System.Windows.Forms.Button snapshotButton;
+    private System.Windows.Forms.Button sequenceButton;
   }
 }

branches/RuntimeOptimizer/HeuristicLab.Optimization.Views/3.3/TimeLimitRunView.cs

@@ -114 +114 @@
     protected override void SetEnabledStateOfExecutableButtons() {
       base.SetEnabledStateOfExecutableButtons();
-      snapshotButton.Enabled = Content != null && (Content.ExecutionState == ExecutionState.Started || Content.ExecutionState == ExecutionState.Paused);
+      snapshotButton.Enabled = Content != null && Content.Algorithm != null && Content.ExecutionState == ExecutionState.Paused;
     }
 
@@ -290 +290 @@
     private void snapshotButton_Click(object sender, EventArgs e) {
       Content.Snapshot();
+    }
+
+    private void sequenceButton_Click(object sender, EventArgs e) {
+      using (var dialog = new DefineArithmeticProgressionDialog(false, 1, Content.MaximumExecutionTime.TotalSeconds, 1)) {
+        if (dialog.ShowDialog() == DialogResult.OK) {
+          Content.SnapshotTimes = new ObservableList<TimeSpan>(dialog.Values.Select(TimeSpan.FromSeconds));
+        }
+      }
     }
     #endregion

branches/RuntimeOptimizer/HeuristicLab.Optimization/3.3/MetaOptimizers/BatchRun.cs

@@ -175 +175 @@
       repetitions = 10;
       repetitionsCounter = 0;
-      Runs = new RunCollection { AlgorithmName = Name };
+      Runs = new RunCollection { OptimizerName = Name };
     }
     public BatchRun(string name)
@@ -185 +185 @@
       repetitions = 10;
       repetitionsCounter = 0;
-      Runs = new RunCollection { AlgorithmName = Name };
+      Runs = new RunCollection { OptimizerName = Name };
     }
     public BatchRun(string name, string description)
@@ -194 +194 @@
       repetitions = 10;
       repetitionsCounter = 0;
-      Runs = new RunCollection { AlgorithmName = Name };
+      Runs = new RunCollection { OptimizerName = Name };
     }
     [StorableConstructor]
@@ -237 +237 @@
         batchRunAction = BatchRunAction.Prepare;
         // a race-condition may occur when the optimizer has changed the state by itself in the meantime
-        try { Optimizer.Prepare(clearRuns); }
-        catch (InvalidOperationException) { }
+        try { Optimizer.Prepare(clearRuns); } catch (InvalidOperationException) { }
       } else {
         ExecutionState = ExecutionState.Stopped;
@@ -250 +249 @@
       if (Optimizer.ExecutionState == ExecutionState.Stopped) Optimizer.Prepare();
       // a race-condition may occur when the optimizer has changed the state by itself in the meantime
-      try { Optimizer.Start(); }
-      catch (InvalidOperationException) { }
+      try { Optimizer.Start(); } catch (InvalidOperationException) { }
     }
     public void Pause() {
@@ -260 +258 @@
       if (Optimizer.ExecutionState != ExecutionState.Started) return;
       // a race-condition may occur when the optimizer has changed the state by itself in the meantime
-      try { Optimizer.Pause(); }
-      catch (InvalidOperationException) { }
+      try { Optimizer.Pause(); } catch (InvalidOperationException) { }
     }
     public void Stop() {
@@ -273 +270 @@
       }
       // a race-condition may occur when the optimizer has changed the state by itself in the meantime
-      try { Optimizer.Stop(); }
-      catch (InvalidOperationException) { }
+      try { Optimizer.Stop(); } catch (InvalidOperationException) { }
     }
 
@@ -280 +276 @@
     protected override void OnNameChanged() {
       base.OnNameChanged();
-      runs.AlgorithmName = Name;
+      runs.OptimizerName = Name;
     }
 

branches/RuntimeOptimizer/HeuristicLab.Optimization/3.3/MetaOptimizers/Experiment.cs

@@ -117 +117 @@
       executionTime = TimeSpan.Zero;
       optimizers = new OptimizerList();
-      Runs = new RunCollection { AlgorithmName = Name };
+      Runs = new RunCollection { OptimizerName = Name };
       Initialize();
     }
@@ -126 +126 @@
       executionTime = TimeSpan.Zero;
       optimizers = new OptimizerList();
-      Runs = new RunCollection { AlgorithmName = Name };
+      Runs = new RunCollection { OptimizerName = Name };
       Initialize();
     }
@@ -134 +134 @@
       executionTime = TimeSpan.Zero;
       optimizers = new OptimizerList();
-      Runs = new RunCollection { AlgorithmName = Name };
+      Runs = new RunCollection { OptimizerName = Name };
       Initialize();
     }
@@ -180 +180 @@
       foreach (IOptimizer optimizer in Optimizers.Where(x => x.ExecutionState != ExecutionState.Started)) {
         // a race-condition may occur when the optimizer has changed the state by itself in the meantime
-        try { optimizer.Prepare(clearRuns); }
-        catch (InvalidOperationException) { }
+        try { optimizer.Prepare(clearRuns); } catch (InvalidOperationException) { }
       }
     }
@@ -194 +193 @@
       if (optimizer != null) {
         // a race-condition may occur when the optimizer has changed the state by itself in the meantime
-        try { optimizer.Start(); }
-        catch (InvalidOperationException) { }
+        try { optimizer.Start(); } catch (InvalidOperationException) { }
       }
     }
@@ -207 +205 @@
       foreach (IOptimizer optimizer in Optimizers.Where(x => x.ExecutionState == ExecutionState.Started)) {
         // a race-condition may occur when the optimizer has changed the state by itself in the meantime
-        try { optimizer.Pause(); }
-        catch (InvalidOperationException) { }
+        try { optimizer.Pause(); } catch (InvalidOperationException) { }
       }
     }
@@ -221 +218 @@
         foreach (var optimizer in Optimizers.Where(x => (x.ExecutionState == ExecutionState.Started) || (x.ExecutionState == ExecutionState.Paused))) {
           // a race-condition may occur when the optimizer has changed the state by itself in the meantime
-          try { optimizer.Stop(); }
-          catch (InvalidOperationException) { }
+          try { optimizer.Stop(); } catch (InvalidOperationException) { }
         }
       } else {
@@ -232 +228 @@
     protected override void OnNameChanged() {
       base.OnNameChanged();
-      Runs.AlgorithmName = Name;
+      Runs.OptimizerName = Name;
     }
 

branches/RuntimeOptimizer/HeuristicLab.Optimization/3.3/MetaOptimizers/TimeLimitRun.cs

@@ -25 +25 @@
 using System.Drawing;
 using System.Linq;
-using System.Threading;
 using System.Threading.Tasks;
-using System.Timers;
 using HeuristicLab.Collections;
 using HeuristicLab.Common;
@@ -33 +31 @@
 using HeuristicLab.Core;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
-using Timer = System.Timers.Timer;
 
 namespace HeuristicLab.Optimization {
@@ -56 +53 @@
     #endregion
 
-    private Timer snapTimer, runTimer;
-    private readonly ManualResetEvent algorithmStarted = new ManualResetEvent(false);
-    private readonly ManualResetEvent algorithmPaused = new ManualResetEvent(false);
-    private readonly ManualResetEvent algorithmStopped = new ManualResetEvent(false);
-    [Storable]
-    private bool snapshotTimesDirty;
+    private bool pausedForSnapshot = false;
+    private bool pausedForTermination = false;
 
     [Storable]
@@ -70 +63 @@
         if (maximumExecutionTime == value) return;
         maximumExecutionTime = value;
-        runTimer.Interval = (maximumExecutionTime - ExecutionTime).TotalMilliseconds;
         OnPropertyChanged("MaximumExecutionTime");
       }
@@ -84 +76 @@
         if (snapshotTimes == value) return;
         snapshotTimes = value;
-        snapshotTimesDirty = true;
+        snapshotTimes.Sort();
+        FindNextSnapshotTimeIndex(ExecutionTime);
         OnPropertyChanged("SnapshotTimes");
       }
@@ -131 +124 @@
         if (algorithm != null) {
           RegisterAlgorithmEvents();
-          if (algorithm.ExecutionState == ExecutionState.Started) algorithmStarted.Set();
-          else algorithmStarted.Reset();
-          if (algorithm.ExecutionState == ExecutionState.Paused) algorithmPaused.Set();
-          else algorithmPaused.Reset();
-          if (algorithm.ExecutionState == ExecutionState.Stopped) algorithmStopped.Set();
-          else algorithmStopped.Reset();
         }
         OnPropertyChanged("Algorithm");
@@ -173 +160 @@
       snapshotTimesIndex = original.snapshotTimesIndex;
       snapshots = cloner.Clone(original.snapshots);
-      snapshotTimesDirty = original.snapshotTimesDirty;
       storeAlgorithmInEachSnapshot = original.storeAlgorithmInEachSnapshot;
       algorithm = cloner.Clone(original.algorithm);
       runs = cloner.Clone(original.runs);
-
-      snapTimer = new Timer() {
-        AutoReset = original.snapTimer.AutoReset,
-        Interval = original.snapTimer.Interval
-      };
-      runTimer = new Timer() {
-        AutoReset = original.runTimer.AutoReset,
-        Interval = original.runTimer.Interval
-      };
-      if (original.algorithm != null && original.algorithm.ExecutionState == ExecutionState.Started)
-        algorithmStarted.Set();
-      if (original.algorithm != null && original.algorithm.ExecutionState == ExecutionState.Paused)
-        algorithmPaused.Set();
-      if (original.algorithm != null && original.algorithm.ExecutionState == ExecutionState.Stopped)
-        algorithmStopped.Set();
 
       Initialize();
@@ -199 +170 @@
       name = ItemName;
       description = ItemDescription;
-      maximumExecutionTime = TimeSpan.FromMinutes(1);
+      maximumExecutionTime = TimeSpan.FromMinutes(.5);
       snapshotTimes = new ObservableList<TimeSpan>(new[] {
           TimeSpan.FromSeconds(5),
           TimeSpan.FromSeconds(10),
-          TimeSpan.FromSeconds(30) });
+          TimeSpan.FromSeconds(15) });
       snapshotTimesIndex = 0;
-      snapTimer = new Timer() {
-        AutoReset = false,
-        Enabled = false,
-        Interval = 100
-      };
-      runTimer = new Timer() {
-        AutoReset = false,
-        Enabled = false,
-        Interval = MaximumExecutionTime.TotalMilliseconds
-      };
       snapshots = new RunCollection();
-      Runs = new RunCollection { AlgorithmName = Name };
+      Runs = new RunCollection { OptimizerName = Name };
       Initialize();
     }
@@ -222 +183 @@
       : base(name) {
       description = ItemDescription;
-      maximumExecutionTime = TimeSpan.FromMinutes(1);
+      maximumExecutionTime = TimeSpan.FromMinutes(.5);
       snapshotTimes = new ObservableList<TimeSpan>(new[] {
           TimeSpan.FromSeconds(5),
           TimeSpan.FromSeconds(10),
-          TimeSpan.FromSeconds(30) });
+          TimeSpan.FromSeconds(15) });
       snapshotTimesIndex = 0;
-      snapTimer = new Timer() {
-        AutoReset = false,
-        Enabled = false,
-        Interval = 100
-      };
-      snapshots = new RunCollection();
-      runTimer = new Timer() {
-        AutoReset = false,
-        Enabled = false,
-        Interval = MaximumExecutionTime.TotalMilliseconds
-      };
-      Runs = new RunCollection { AlgorithmName = Name };
+      Runs = new RunCollection { OptimizerName = Name };
       Initialize();
     }
     public TimeLimitRun(string name, string description)
       : base(name, description) {
-      maximumExecutionTime = TimeSpan.FromMinutes(1);
+      maximumExecutionTime = TimeSpan.FromMinutes(.5);
       snapshotTimes = new ObservableList<TimeSpan>(new[] {
           TimeSpan.FromSeconds(5),
           TimeSpan.FromSeconds(10),
-          TimeSpan.FromSeconds(30) });
+          TimeSpan.FromSeconds(15) });
       snapshotTimesIndex = 0;
-      snapTimer = new Timer() {
-        AutoReset = false,
-        Enabled = false,
-        Interval = 100
-      };
-      snapshots = new RunCollection();
-      runTimer = new Timer() {
-        AutoReset = false,
-        Enabled = false,
-        Interval = MaximumExecutionTime.TotalMilliseconds
-      };
-      Runs = new RunCollection { AlgorithmName = Name };
+      Runs = new RunCollection { OptimizerName = Name };
       Initialize();
     }
@@ -272 +211 @@
     [StorableHook(HookType.AfterDeserialization)]
     private void AfterDeserialization() {
-      // the timers will not be serialized
-      snapTimer = new Timer() {
-        AutoReset = false,
-        Enabled = false,
-        Interval = 100
-      };
-      runTimer = new Timer() {
-        AutoReset = false,
-        Enabled = false,
-        Interval = double.MaxValue
-      };
-      if (Algorithm != null && Algorithm.ExecutionState == ExecutionState.Started)
-        algorithmStarted.Set();
-      else algorithmStarted.Reset();
-      if (Algorithm != null && Algorithm.ExecutionState == ExecutionState.Paused)
-        algorithmPaused.Set();
-      else algorithmPaused.Reset();
-      if (Algorithm != null && Algorithm.ExecutionState == ExecutionState.Stopped)
-        algorithmStopped.Set();
-      else algorithmStopped.Reset();
       Initialize();
     }
@@ -302 +221 @@
       snapshotTimes.ItemsReplaced += snapshotTimes_Changed;
       snapshotTimes.CollectionReset += snapshotTimes_Changed;
-      snapTimer.Elapsed += snapshotTimer_Elapsed;
-      runTimer.Elapsed += runTimer_Elapsed;
-    }
-
-    private void snapshotTimes_Changed(object sender, EventArgs e) {
-      snapshotTimesDirty = true;
-    }
-
-    private readonly object snapshotLock = new object();
-    private void snapshotTimer_Elapsed(object sender, ElapsedEventArgs e) {
-      snapTimer.Stop();
-      lock (snapshotLock) {
-        try {
-          if (Algorithm == null) return;
-          if (ExecutionState != ExecutionState.Started) return;
-
-          var execTime = ExecutionTime;
-          if (snapshotTimesIndex < SnapshotTimes.Count &&
-              SnapshotTimes[snapshotTimesIndex] <= execTime) {
-            DoSnapshot();
-            snapshotTimesIndex++;
-            try {
-              Algorithm.Start();
-              algorithmStarted.WaitOne();
-            } catch (InvalidOperationException) { }
-          }
-        } catch { }
-        snapTimer.Start();
-      }
-    }
-
-    private void runTimer_Elapsed(object sender, ElapsedEventArgs e) {
-      snapTimer.Stop();
-      lock (snapshotLock) {
-        try {
-          Algorithm.Stop();
-          algorithmStopped.WaitOne();
-        } catch (InvalidOperationException) { }
-      }
-    }
+    }
+
+    private void snapshotTimes_Changed(object sender, CollectionItemsChangedEventArgs<IndexedItem<TimeSpan>> e) {
+      if (e.Items.Any()) snapshotTimes.Sort();
+      FindNextSnapshotTimeIndex(ExecutionTime);
+    }
+
+    public void Snapshot() {
+      if (Algorithm == null || Algorithm.ExecutionState != ExecutionState.Paused) throw new InvalidOperationException("Snapshot not allowed in execution states other than Paused");
+      Task.Factory.StartNew(MakeSnapshot);
+    }
+
+    public void Prepare() {
+      Prepare(false);
+    }
+    public void Prepare(bool clearRuns) {
+      Algorithm.Prepare(clearRuns);
+    }
+    public void Start() {
+      Algorithm.Start();
+    }
+    public void Pause() {
+      Algorithm.Pause();
+    }
+    public void Stop() {
+      Algorithm.Stop();
+    }
+
+    #region Events
+    protected override void OnNameChanged() {
+      base.OnNameChanged();
+      runs.OptimizerName = Name;
+    }
+
+    public event PropertyChangedEventHandler PropertyChanged;
+    private void OnPropertyChanged(string property) {
+      var handler = PropertyChanged;
+      if (handler != null) handler(this, new PropertyChangedEventArgs(property));
+    }
+
+    #region IExecutable Events
+    public event EventHandler ExecutionStateChanged;
+    private void OnExecutionStateChanged() {
+      var handler = ExecutionStateChanged;
+      if (handler != null) handler(this, EventArgs.Empty);
+    }
+    public event EventHandler ExecutionTimeChanged;
+    private void OnExecutionTimeChanged() {
+      var handler = ExecutionTimeChanged;
+      if (handler != null) handler(this, EventArgs.Empty);
+    }
+    public event EventHandler Prepared;
+    private void OnPrepared() {
+      var handler = Prepared;
+      if (handler != null) handler(this, EventArgs.Empty);
+    }
+    public event EventHandler Started;
+    private void OnStarted() {
+      var handler = Started;
+      if (handler != null) handler(this, EventArgs.Empty);
+    }
+    public event EventHandler Paused;
+    private void OnPaused() {
+      var handler = Paused;
+      if (handler != null) handler(this, EventArgs.Empty);
+    }
+    public event EventHandler Stopped;
+    private void OnStopped() {
+      var handler = Stopped;
+      if (handler != null) handler(this, EventArgs.Empty);
+    }
+    public event EventHandler<EventArgs<Exception>> ExceptionOccurred;
+    private void OnExceptionOccurred(Exception exception) {
+      var handler = ExceptionOccurred;
+      if (handler != null) handler(this, new EventArgs<Exception>(exception));
+    }
+    #endregion
+
+    #region Algorithm Events
+    private void RegisterAlgorithmEvents() {
+      algorithm.ExceptionOccurred += Algorithm_ExceptionOccurred;
+      algorithm.ExecutionTimeChanged += Algorithm_ExecutionTimeChanged;
+      algorithm.ExecutionStateChanged += Algorithm_ExecutionStateChanged;
+      algorithm.Paused += Algorithm_Paused;
+      algorithm.Prepared += Algorithm_Prepared;
+      algorithm.Started += Algorithm_Started;
+      algorithm.Stopped += Algorithm_Stopped;
+    }
+    private void DeregisterAlgorithmEvents() {
+      algorithm.ExceptionOccurred -= Algorithm_ExceptionOccurred;
+      algorithm.ExecutionTimeChanged -= Algorithm_ExecutionTimeChanged;
+      algorithm.ExecutionStateChanged -= Algorithm_ExecutionStateChanged;
+      algorithm.Paused -= Algorithm_Paused;
+      algorithm.Prepared -= Algorithm_Prepared;
+      algorithm.Started -= Algorithm_Started;
+      algorithm.Stopped -= Algorithm_Stopped;
+    }
+    private void Algorithm_ExceptionOccurred(object sender, EventArgs<Exception> e) {
+      OnExceptionOccurred(e.Value);
+    }
+    private void Algorithm_ExecutionTimeChanged(object sender, EventArgs e) {
+      if (snapshotTimesIndex < SnapshotTimes.Count && ExecutionTime >= SnapshotTimes[snapshotTimesIndex]
+        && !pausedForSnapshot) {
+        pausedForSnapshot = true;
+        Algorithm.Pause();
+      }
+      if (ExecutionTime >= MaximumExecutionTime && !pausedForTermination) {
+        pausedForTermination = true;
+        if (!pausedForSnapshot) Algorithm.Pause();
+      }
+      OnExecutionTimeChanged();
+    }
+    private void Algorithm_ExecutionStateChanged(object sender, EventArgs e) {
+      OnExecutionStateChanged();
+    }
+    private void Algorithm_Paused(object sender, EventArgs e) {
+      var action = pausedForTermination ? ExecutionState.Stopped : (pausedForSnapshot ? ExecutionState.Started : ExecutionState.Paused);
+      if (pausedForSnapshot || pausedForTermination) {
+        pausedForSnapshot = pausedForTermination = false;
+        MakeSnapshot();
+        snapshotTimesIndex++;
+      }
+      OnPaused();
+      if (action == ExecutionState.Started) Algorithm.Start();
+      else if (action == ExecutionState.Stopped) Algorithm.Stop();
+    }
+    private void Algorithm_Prepared(object sender, EventArgs e) {
+      snapshotTimesIndex = 0;
+      snapshots.Clear();
+      OnPrepared();
+    }
+    private void Algorithm_Started(object sender, EventArgs e) {
+      OnStarted();
+    }
+    private void Algorithm_Stopped(object sender, EventArgs e) {
+      var cloner = new Cloner();
+      var algRun = cloner.Clone(Algorithm.Runs.Last());
+      var clonedSnapshots = cloner.Clone(snapshots);
+      try {
+        algRun.Results.Add("Snapshots", clonedSnapshots);
+      } catch (ArgumentException ex) { // Snapshots already exists
+        // TODO strategy?
+      }
+      Runs.Add(algRun);
+      Algorithm.Runs.Clear();
+      OnStopped();
+    }
+    #endregion
+    #endregion
 
     private void FindNextSnapshotTimeIndex(TimeSpan reference) {
@@ -349 +377 @@
       };
       snapshotTimesIndex = index;
-    }
-
-    private void DoSnapshot() {
-      lock (snapshotLock) {
-        var wasPaused = Algorithm.ExecutionState == ExecutionState.Paused;
-        var error = false;
-        try {
-          Algorithm.Pause();
-          algorithmPaused.WaitOne();
-        } catch (InvalidOperationException) {
-          error = true;
-        }
-        if (error && ExecutionState != ExecutionState.Paused) return; // Algorithm is either stopped or prepared
-
-        MakeSnapshot();
-        if (!wasPaused) {
-          try {
-            Algorithm.Start();
-            algorithmStarted.WaitOne();
-          } catch (InvalidOperationException) { }
-        }
-      }
     }
 
@@ -397 +403 @@
       snapshots.Add(run);
     }
-
-    public void Snapshot() {
-      Task.Factory.StartNew(DoSnapshot);
-    }
-
-    public void Prepare() {
-      Prepare(false);
-    }
-    public void Prepare(bool clearRuns) {
-      Algorithm.Prepare(clearRuns);
-    }
-    public void Start() {
-      Algorithm.Start();
-    }
-    public void Pause() {
-      Algorithm.Pause();
-    }
-    public void Stop() {
-      Algorithm.Stop();
-    }
-
-    #region Events
-    protected override void OnNameChanged() {
-      base.OnNameChanged();
-      runs.AlgorithmName = Name;
-    }
-
-    public event PropertyChangedEventHandler PropertyChanged;
-    private void OnPropertyChanged(string property) {
-      var handler = PropertyChanged;
-      if (handler != null) handler(this, new PropertyChangedEventArgs(property));
-    }
-
-    #region IExecutable Events
-    public event EventHandler ExecutionStateChanged;
-    private void OnExecutionStateChanged() {
-      var handler = ExecutionStateChanged;
-      if (handler != null) handler(this, EventArgs.Empty);
-    }
-    public event EventHandler ExecutionTimeChanged;
-    private void OnExecutionTimeChanged() {
-      var handler = ExecutionTimeChanged;
-      if (handler != null) handler(this, EventArgs.Empty);
-    }
-    public event EventHandler Prepared;
-    private void OnPrepared() {
-      var handler = Prepared;
-      if (handler != null) handler(this, EventArgs.Empty);
-    }
-    public event EventHandler Started;
-    private void OnStarted() {
-      var handler = Started;
-      if (handler != null) handler(this, EventArgs.Empty);
-    }
-    public event EventHandler Paused;
-    private void OnPaused() {
-      var handler = Paused;
-      if (handler != null) handler(this, EventArgs.Empty);
-    }
-    public event EventHandler Stopped;
-    private void OnStopped() {
-      var handler = Stopped;
-      if (handler != null) handler(this, EventArgs.Empty);
-    }
-    public event EventHandler<EventArgs<Exception>> ExceptionOccurred;
-    private void OnExceptionOccurred(Exception exception) {
-      var handler = ExceptionOccurred;
-      if (handler != null) handler(this, new EventArgs<Exception>(exception));
-    }
-    #endregion
-
-    #region Algorithm Events
-    private void RegisterAlgorithmEvents() {
-      algorithm.ExceptionOccurred += Algorithm_ExceptionOccurred;
-      algorithm.ExecutionTimeChanged += Algorithm_ExecutionTimeChanged;
-      algorithm.ExecutionStateChanged += Algorithm_ExecutionStateChanged;
-      algorithm.Paused += Algorithm_Paused;
-      algorithm.Prepared += Algorithm_Prepared;
-      algorithm.Started += Algorithm_Started;
-      algorithm.Stopped += Algorithm_Stopped;
-    }
-    private void DeregisterAlgorithmEvents() {
-      algorithm.ExceptionOccurred -= Algorithm_ExceptionOccurred;
-      algorithm.ExecutionTimeChanged -= Algorithm_ExecutionTimeChanged;
-      algorithm.ExecutionStateChanged -= Algorithm_ExecutionStateChanged;
-      algorithm.Paused -= Algorithm_Paused;
-      algorithm.Prepared -= Algorithm_Prepared;
-      algorithm.Started -= Algorithm_Started;
-      algorithm.Stopped -= Algorithm_Stopped;
-    }
-    private void Algorithm_ExceptionOccurred(object sender, EventArgs<Exception> e) {
-      OnExceptionOccurred(e.Value);
-    }
-    private void Algorithm_ExecutionTimeChanged(object sender, EventArgs e) {
-      OnExecutionTimeChanged();
-    }
-    private void Algorithm_ExecutionStateChanged(object sender, EventArgs e) {
-      OnExecutionStateChanged();
-    }
-    private void Algorithm_Paused(object sender, EventArgs e) {
-      algorithmStarted.Reset();
-      algorithmPaused.Set();
-      algorithmStopped.Reset();
-      OnPaused();
-    }
-    private void Algorithm_Prepared(object sender, EventArgs e) {
-      algorithmStarted.Reset();
-      algorithmPaused.Reset();
-      algorithmStopped.Reset();
-      snapTimer.Stop();
-      runTimer.Stop();
-      snapshotTimesIndex = 0;
-      snapshots.Clear();
-      OnPrepared();
-    }
-    private void Algorithm_Started(object sender, EventArgs e) {
-      algorithmStarted.Set();
-      algorithmPaused.Reset();
-      algorithmStopped.Reset();
-      var execTime = ExecutionTime;
-      if (snapshotTimesDirty) {
-        SnapshotTimes.Sort();
-        snapshotTimesDirty = false; // sort will mark it dirty again
-        FindNextSnapshotTimeIndex(execTime);
-      }
-      runTimer.Interval = (MaximumExecutionTime - execTime).TotalMilliseconds;
-      snapTimer.Start();
-      runTimer.Start();
-      OnStarted();
-    }
-    private void Algorithm_Stopped(object sender, EventArgs e) {
-      algorithmStarted.Reset();
-      algorithmPaused.Reset();
-      algorithmStopped.Set();
-      lock (snapshotLock) {
-        snapTimer.Stop();
-        runTimer.Stop();
-        MakeSnapshot();
-      }
-      var cloner = new Cloner();
-      var algRun = cloner.Clone(Algorithm.Runs.Last());
-      var clonedSnapshots = cloner.Clone(snapshots);
-      try {
-        algRun.Results.Add("Snapshots", clonedSnapshots);
-      } catch (ArgumentException ex) {
-        // TODO strategy?
-      }
-      Runs.Add(algRun);
-      Algorithm.Runs.Clear();
-      OnStopped();
-    }
-    #endregion
-    #endregion
   }
 }

branches/RuntimeOptimizer/HeuristicLab.Optimizer/3.3/CreateExperimentDialog.cs

@@ -30 +30 @@
 using HeuristicLab.Core;
 using HeuristicLab.Data;
+using HeuristicLab.MainForm.WindowsForms;
 using HeuristicLab.Optimization;
 using HeuristicLab.Parameters;

branches/RuntimeOptimizer/HeuristicLab.Optimizer/3.3/HeuristicLab.Optimizer-3.3.csproj

@@ -128 +128 @@
     <EmbeddedResource Include="Documents\RAPGA_JSSP.hl" />
     <None Include="Plugin.cs.frame" />
-    <Compile Include="DefineArithmeticProgressionDialog.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="DefineArithmeticProgressionDialog.Designer.cs">
-      <DependentUpon>DefineArithmeticProgressionDialog.cs</DependentUpon>
-    </Compile>
     <Compile Include="OptimizerSingleDocumentMainForm.cs">
       <SubType>Form</SubType>