Changeset 9041 for branches

Timestamp:

12/12/12 16:50:46 (12 years ago)

Author:

abeham

Message:

#1985:

• Moved code to format and parse timespans to a TimeSpanHelper class
• Added a dialog for defining arithmetic sequences of timespans

Location:

branches/RuntimeOptimizer

Files:

• HeuristicLab.Common/3.3/HeuristicLab.Common-3.3.csproj (modified) (3 diffs)
• HeuristicLab.Common/3.3/TimeSpanHelper.cs (added)
• HeuristicLab.MainForm.WindowsForms/3.3/Dialogs/DefineArithmeticProgressionTimeDialog.Designer.cs (added)
• HeuristicLab.MainForm.WindowsForms/3.3/Dialogs/DefineArithmeticProgressionTimeDialog.cs (added)
• HeuristicLab.MainForm.WindowsForms/3.3/HeuristicLab.MainForm.WindowsForms-3.3.csproj (modified) (1 diff)
• HeuristicLab.Optimization.Views/3.3/TimeLimitRunView.Designer.cs (modified) (2 diffs)
• HeuristicLab.Optimization.Views/3.3/TimeLimitRunView.cs (modified) (11 diffs)

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

@@ -135 +135 @@
     <Compile Include="Plugin.cs" />
     <Compile Include="ReferenceEqualityComparer.cs" />
+    <Compile Include="TimeSpanHelper.cs" />
     <Compile Include="TypeEqualityComparer.cs" />
     <Compile Include="TypeExtensions.cs" />
@@ -180 +181 @@
   -->
   <PropertyGroup>
-   <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">set Path=%25Path%25;$(ProjectDir);$(SolutionDir)
+    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">set Path=%25Path%25;$(ProjectDir);$(SolutionDir)
 set ProjectDir=$(ProjectDir)
 set SolutionDir=$(SolutionDir)
@@ -187 +188 @@
 call PreBuildEvent.cmd
 </PreBuildEvent>
-<PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
 export ProjectDir=$(ProjectDir)
 export SolutionDir=$(SolutionDir)

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

@@ -126 +126 @@
       <DependentUpon>DragOverTabControl.cs</DependentUpon>
     </Compile>
+    <Compile Include="Dialogs\DefineArithmeticProgressionTimeDialog.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="Dialogs\DefineArithmeticProgressionTimeDialog.Designer.cs">
+      <DependentUpon>DefineArithmeticProgressionTimeDialog.cs</DependentUpon>
+    </Compile>
     <Compile Include="Dialogs\DefineArithmeticProgressionDialog.cs">
       <SubType>Form</SubType>

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

@@ -202 +202 @@
       // openAlgorithmButton
       // 
-      this.openAlgorithmButton.Image = ((System.Drawing.Image)(resources.GetObject("openAlgorithmButton.Image")));
+      this.openAlgorithmButton.Image = HeuristicLab.Common.Resources.VSImageLibrary.Open;
       this.openAlgorithmButton.Location = new System.Drawing.Point(36, 6);
       this.openAlgorithmButton.Name = "openAlgorithmButton";
@@ -213 +213 @@
       // newAlgorithmButton
       // 
-      this.newAlgorithmButton.Image = ((System.Drawing.Image)(resources.GetObject("newAlgorithmButton.Image")));
+      this.newAlgorithmButton.Image = HeuristicLab.Common.Resources.VSImageLibrary.NewDocument;
       this.newAlgorithmButton.Location = new System.Drawing.Point(6, 6);
       this.newAlgorithmButton.Name = "newAlgorithmButton";

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

@@ -84 +84 @@
       try {
         if (Content == null) {
-          timeLimitTextBox.Text = FormatTimeSpan(TimeSpan.FromSeconds(60));
+          timeLimitTextBox.Text = TimeSpanHelper.FormatNatural(TimeSpan.FromSeconds(60));
           snapshotsTextBox.Text = String.Empty;
           storeAlgorithmInEachSnapshotCheckBox.Checked = false;
@@ -91 +91 @@
           runsView.Content = null;
         } else {
-          timeLimitTextBox.Text = FormatTimeSpan(Content.MaximumExecutionTime);
-          snapshotsTextBox.Text = String.Join(" ; ", Content.SnapshotTimes.Select(x => FormatTimeSpan(x, true)));
+          timeLimitTextBox.Text = TimeSpanHelper.FormatNatural(Content.MaximumExecutionTime);
+          snapshotsTextBox.Text = String.Join(" ; ", Content.SnapshotTimes.Select(x => TimeSpanHelper.FormatNatural(x, true)));
           storeAlgorithmInEachSnapshotCheckBox.Checked = Content.StoreAlgorithmInEachSnapshot;
           algorithmViewHost.Content = Content.Algorithm;
@@ -137 +137 @@
           SuppressEvents = true;
           try {
-            timeLimitTextBox.Text = FormatTimeSpan(Content.MaximumExecutionTime);
+            timeLimitTextBox.Text = TimeSpanHelper.FormatNatural(Content.MaximumExecutionTime);
           } finally { SuppressEvents = false; }
           break;
@@ -144 +144 @@
           try {
             if (Content.SnapshotTimes.Any())
-              snapshotsTextBox.Text = String.Join(" ; ", Content.SnapshotTimes.Select(x => FormatTimeSpan(x, true)));
+              snapshotsTextBox.Text = String.Join(" ; ", Content.SnapshotTimes.Select(x => TimeSpanHelper.FormatNatural(x, true)));
             else snapshotsTextBox.Text = String.Empty;
             Content.SnapshotTimes.ItemsAdded += Content_SnapshotTimes_Changed;
@@ -184 +184 @@
       try {
         if (Content.SnapshotTimes.Any())
-          snapshotsTextBox.Text = string.Join(" ; ", Content.SnapshotTimes.Select(x => FormatTimeSpan(x, true)));
+          snapshotsTextBox.Text = string.Join(" ; ", Content.SnapshotTimes.Select(x => TimeSpanHelper.FormatNatural(x, true)));
         else snapshotsTextBox.Text = String.Empty;
       } finally { SuppressEvents = false; }
@@ -194 +194 @@
       if (SuppressEvents) return;
       TimeSpan ts;
-      if (!TryGetTimeSpanFromFormat(timeLimitTextBox.Text, out ts)) {
+      if (!TimeSpanHelper.TryGetFromNaturalFormat(timeLimitTextBox.Text, out ts)) {
         e.Cancel = true;
         errorProvider.SetError(timeLimitTextBox, "Please enter a valid time span, e.g. 60, 20s, 45 seconds, 3h, 1 hour, 4 d, 2 days");
@@ -200 +200 @@
         Content.MaximumExecutionTime = ts;
         e.Cancel = false;
-        errorProvider.SetError(timeLimitTextBox, String.Empty);
+        errorProvider.SetError(timeLimitTextBox, null);
       }
     }
@@ -207 +207 @@
       if (SuppressEvents) return;
       e.Cancel = false;
-      errorProvider.SetError(timeLimitTextBox, String.Empty);
+      errorProvider.SetError(snapshotsTextBox, null);
 
       var snapshotTimes = new ObservableList<TimeSpan>();
@@ -213 +213 @@
       foreach (Match m in matches) {
         TimeSpan value;
-        if (!TryGetTimeSpanFromFormat(m.Value, out value)) {
+        if (!TimeSpanHelper.TryGetFromNaturalFormat(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");
@@ -297 +297 @@
 
     private void sequenceButton_Click(object sender, EventArgs e) {
-      using (var dialog = new DefineArithmeticProgressionDialog(false, 1, Content.MaximumExecutionTime.TotalSeconds, 1)) {
+      using (var dialog = new DefineArithmeticTimeSpanProgressionDialog(TimeSpan.FromSeconds(1), Content.MaximumExecutionTime, TimeSpan.FromSeconds(1))) {
         if (dialog.ShowDialog() == DialogResult.OK) {
           if (dialog.Values.Any())
-            Content.SnapshotTimes = new ObservableList<TimeSpan>(dialog.Values.Select(TimeSpan.FromSeconds));
+            Content.SnapshotTimes = new ObservableList<TimeSpan>(dialog.Values);
           else Content.SnapshotTimes = new ObservableList<TimeSpan>();
         }
@@ -307 +307 @@
     #endregion
     #endregion
-
-    private string FormatTimeSpan(TimeSpan ts, bool abbrevUnit = false) {
-      if (ts.TotalSeconds < 180) return ts.TotalSeconds + (abbrevUnit ? "s" : " seconds");
-      if (ts.TotalMinutes < 180) return ts.TotalMinutes + (abbrevUnit ? "min" : " minutes");
-      if (ts.TotalHours < 96) return ts.TotalHours + (abbrevUnit ? "h" : " hours");
-      return ts.TotalDays + (abbrevUnit ? "d" : " days");
-    }
-
-    private bool TryGetTimeSpanFromFormat(string text, out TimeSpan result) {
-      double value;
-      result = TimeSpan.Zero;
-
-      var numberMatch = Regex.Match(text, @"\d+");
-      if (!numberMatch.Success) return false;
-
-      if (!double.TryParse(numberMatch.Value, out value))
-        return false;
-
-      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;
-    }
   }
 }