Changeset 15400 for trunk/sources/HeuristicLab.MainForm

Timestamp:

10/04/17 13:55:43 (7 years ago)

Author:

pfleck

Message:

#1666:

• Reverted r15371 for HeuristicLab.MainForm and HeuristicLab.MainForm.WindowsForms (all changes concerning the progress)
• Changed the signature of OptimizeConstants in the simplifiers to "tree in - tree out" (thanks to bburlacu)

Location:

trunk/sources/HeuristicLab.MainForm/3.3

Files:

• Interfaces/IProgress.cs (modified) (1 diff)
• Progress.cs (modified) (2 diffs)

trunk/sources/HeuristicLab.MainForm/3.3/Interfaces/IProgress.cs

@@ -64 +64 @@
     /// </summary>
     void Start();
+
     void Start(string status);
-    void Start(string status, double progressValue);
 
     /// <summary>

trunk/sources/HeuristicLab.MainForm/3.3/Progress.cs

@@ -72 +72 @@
       canBeCanceled = false;
     }
+    public Progress(string status)
+      : this() {
+      this.status = status;
+    }
+    public Progress(string status, ProgressState state)
+      : this() {
+      this.status = status;
+      this.progressState = state;
+    }
 
     public void Cancel() {
@@ -84 +93 @@
 
     public void Start() {
-      Start(string.Empty);
+      ProgressValue = 0.0;
+      ProgressState = ProgressState.Started;
     }
+
     public void Start(string status) {
-      Start(status, -1.0);
-    }
-    public void Start(string status, double progressValue) {
-      ProgressState = ProgressState.Started;
-      Status = status ?? string.Empty;
-      ProgressValue = progressValue;
+      Start();
+      Status = status;
     }