Changeset 9040 for branches/RuntimeOptimizer/HeuristicLab.Optimization.Views/3.3/TimeLimitRunView.cs

Timestamp:

12/12/12 14:53:54 (11 years ago)

Author:

abeham

Message:

#1985:

• Added camera icon
• Rewrote time matching to use regular expressions
• Changed item name of TimeLimitRun

File:

• branches/RuntimeOptimizer/HeuristicLab.Optimization.Views/3.3/TimeLimitRunView.cs (modified) (4 diffs)

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

@@ -23 +23 @@
 using System.ComponentModel;
 using System.Linq;
+using System.Text.RegularExpressions;
 using System.Windows.Forms;
 using HeuristicLab.Collections;
@@ -48 +49 @@
       InitializeComponent();
       snapshotButton.Text = String.Empty;
-      snapshotButton.Image = VSImageLibrary.Breakpoint;
+      snapshotButton.Image = VSImageLibrary.Camera;
     }
 
@@ -208 +209 @@
       errorProvider.SetError(timeLimitTextBox, String.Empty);
 
-      var tokens = snapshotsTextBox.Text.Trim().Split(new[] { ';' }, StringSplitOptions.RemoveEmptyEntries);
-
       var snapshotTimes = new ObservableList<TimeSpan>();
-      foreach (var t in tokens) {
+      var matches = Regex.Matches(snapshotsTextBox.Text, @"(\d+[ \t]*\w+)");
+      foreach (Match m in matches) {
         TimeSpan value;
-        if (!TryGetTimeSpanFromFormat(t, out value)) {
-          e.Cancel = true;
-          errorProvider.SetError(snapshotsTextBox, "Error parsing " + t + ", please provide a valid time span, e.g. 60, 20s, 45 seconds, 3h, 1 hour, 4 d, 2 days");
+        if (!TryGetTimeSpanFromFormat(m.Value, out value)) {
+          e.Cancel = !snapshotsTextBox.ReadOnly && snapshotsTextBox.Enabled; // don't cancel an operation that cannot be edited
+          errorProvider.SetError(snapshotsTextBox, "Error parsing " + m.Value + ", please provide a valid time span, e.g. 60, 20s, 45 seconds, 3h, 1 hour, 4 d, 2 days");
           return;
         } else {
@@ -317 +317 @@
     private bool TryGetTimeSpanFromFormat(string text, out TimeSpan result) {
       double value;
-      text = text.Trim();
-      var length = text.Length;
-      while (!double.TryParse(text.Substring(0, length), out value)) {
-        length--;
-        if (length <= 0) {
-          value = double.NaN;
-          break;
-        }
-      }
-      if (double.IsNaN(value)) {
-        result = TimeSpan.Zero;
+      result = TimeSpan.Zero;
+
+      var numberMatch = Regex.Match(text, @"\d+");
+      if (!numberMatch.Success) return false;
+
+      if (!double.TryParse(numberMatch.Value, out value))
         return false;
-      } else {
-        var remaining = String.Empty;
-        if (length < text.Length) remaining = text.Substring(length, text.Length - length);
-        switch (remaining.Trim()) {
-          case "d":
-          case "day":
-          case "days": result = TimeSpan.FromDays(value); break;
-          case "h":
-          case "hour":
-          case "hours": result = TimeSpan.FromHours(value); break;
-          case "min":
-          case "minute":
-          case "minutes": result = TimeSpan.FromMinutes(value); break;
-          default: result = TimeSpan.FromSeconds(value); break;
-        }
-        return true;
-      }
+
+      var unitMatch = Regex.Match(text, @"[a-zA-Z]+$");
+      if (!unitMatch.Success) return false;
+
+      switch (unitMatch.Value) {
+        case "d":
+        case "day":
+        case "days": result = TimeSpan.FromDays(value); break;
+        case "h":
+        case "hour":
+        case "hours": result = TimeSpan.FromHours(value); break;
+        case "min":
+        case "minute":
+        case "minutes": result = TimeSpan.FromMinutes(value); break;
+        case "s":
+        case "second":
+        case "seconds": result = TimeSpan.FromSeconds(value); break;
+        default: return false;
+      }
+      return true;
     }
   }