Changeset 8977

Timestamp:

11/29/12 13:47:28 (12 years ago)

Author:

abeham

Message:

#1985: Fixed case where no snapshots should be made

Location:

branches/RuntimeOptimizer

Files:

• HeuristicLab.Optimization.Views/3.3/TimeLimitRunView.cs (modified) (4 diffs)
• HeuristicLab.Optimization/3.3/MetaOptimizers/TimeLimitRun.cs (modified) (1 diff)

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

@@ -142 +142 @@
           SuppressEvents = true;
           try {
-            snapshotsTextBox.Text = string.Join(" ; ", Content.SnapshotTimes.Select(x => FormatTimeSpan(x, true)));
+            if (Content.SnapshotTimes.Any())
+              snapshotsTextBox.Text = String.Join(" ; ", Content.SnapshotTimes.Select(x => FormatTimeSpan(x, true)));
+            else snapshotsTextBox.Text = String.Empty;
             Content.SnapshotTimes.ItemsAdded += Content_SnapshotTimes_Changed;
             Content.SnapshotTimes.ItemsMoved += Content_SnapshotTimes_Changed;
@@ -180 +182 @@
       SuppressEvents = true;
       try {
-        snapshotsTextBox.Text = string.Join(" ; ", Content.SnapshotTimes.Select(x => FormatTimeSpan(x, true)));
+        if (Content.SnapshotTimes.Any())
+          snapshotsTextBox.Text = string.Join(" ; ", Content.SnapshotTimes.Select(x => FormatTimeSpan(x, true)));
+        else snapshotsTextBox.Text = String.Empty;
       } finally { SuppressEvents = false; }
     }
@@ -204 +208 @@
       errorProvider.SetError(timeLimitTextBox, String.Empty);
 
-      var tokens = snapshotsTextBox.Text.Split(new[] { ';' }, StringSplitOptions.RemoveEmptyEntries);
+      var tokens = snapshotsTextBox.Text.Trim().Split(new[] { ';' }, StringSplitOptions.RemoveEmptyEntries);
 
       var snapshotTimes = new ObservableList<TimeSpan>();
@@ -295 +299 @@
       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));
+          if (dialog.Values.Any())
+            Content.SnapshotTimes = new ObservableList<TimeSpan>(dialog.Values.Select(TimeSpan.FromSeconds));
+          else Content.SnapshotTimes = new ObservableList<TimeSpan>();
         }
       }

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

@@ -341 +341 @@
         pausedForSnapshot = pausedForTermination = false;
         MakeSnapshot();
-        snapshotTimesIndex++;
+        FindNextSnapshotTimeIndex(ExecutionTime);
       }
       OnPaused();