Changeset 8961 for branches/RuntimeOptimizer/HeuristicLab.Optimization

Timestamp:

11/28/12 11:03:38 (12 years ago)

Author:

abeham

Message:

#1985: added ability to edit snapshot times (changed representation to a list of timespan instead of a list of double)

File:

• branches/RuntimeOptimizer/HeuristicLab.Optimization/3.3/MetaOptimizers/TimeLimitRun.cs (modified) (7 diffs)

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

@@ -78 +78 @@
     private int snapshotTimesIndex;
     [Storable]
-    private ObservableList<double> snapshotTimes;
-    public ObservableList<double> SnapshotTimes {
+    private ObservableList<TimeSpan> snapshotTimes;
+    public ObservableList<TimeSpan> SnapshotTimes {
       get { return snapshotTimes; }
       set {
@@ -170 +170 @@
       : base(original, cloner) {
       maximumExecutionTime = original.maximumExecutionTime;
-      snapshotTimes = new ObservableList<double>(original.snapshotTimes);
+      snapshotTimes = new ObservableList<TimeSpan>(original.snapshotTimes);
       snapshotTimesIndex = original.snapshotTimesIndex;
       snapshots = cloner.Clone(original.snapshots);
@@ -200 +200 @@
       description = ItemDescription;
       maximumExecutionTime = TimeSpan.FromMinutes(1);
-      snapshotTimes = new ObservableList<double>(new[] {
-          TimeSpan.FromSeconds(5).TotalMilliseconds,
-          TimeSpan.FromSeconds(10).TotalMilliseconds,
-          TimeSpan.FromSeconds(30).TotalMilliseconds });
+      snapshotTimes = new ObservableList<TimeSpan>(new[] {
+          TimeSpan.FromSeconds(5),
+          TimeSpan.FromSeconds(10),
+          TimeSpan.FromSeconds(30) });
       snapshotTimesIndex = 0;
       snapTimer = new Timer() {
@@ -223 +223 @@
       description = ItemDescription;
       maximumExecutionTime = TimeSpan.FromMinutes(1);
-      snapshotTimes = new ObservableList<double>(new[] {
-          TimeSpan.FromSeconds(5).TotalMilliseconds,
-          TimeSpan.FromSeconds(10).TotalMilliseconds,
-          TimeSpan.FromSeconds(30).TotalMilliseconds });
+      snapshotTimes = new ObservableList<TimeSpan>(new[] {
+          TimeSpan.FromSeconds(5),
+          TimeSpan.FromSeconds(10),
+          TimeSpan.FromSeconds(30) });
       snapshotTimesIndex = 0;
       snapTimer = new Timer() {
@@ -245 +245 @@
       : base(name, description) {
       maximumExecutionTime = TimeSpan.FromMinutes(1);
-      snapshotTimes = new ObservableList<double>(new[] {
-          TimeSpan.FromSeconds(5).TotalMilliseconds,
-          TimeSpan.FromSeconds(10).TotalMilliseconds,
-          TimeSpan.FromSeconds(30).TotalMilliseconds });
+      snapshotTimes = new ObservableList<TimeSpan>(new[] {
+          TimeSpan.FromSeconds(5),
+          TimeSpan.FromSeconds(10),
+          TimeSpan.FromSeconds(30) });
       snapshotTimesIndex = 0;
       snapTimer = new Timer() {
@@ -320 +320 @@
           var execTime = ExecutionTime;
           if (snapshotTimesIndex < SnapshotTimes.Count &&
-              SnapshotTimes[snapshotTimesIndex] <= execTime.TotalMilliseconds) {
+              SnapshotTimes[snapshotTimesIndex] <= execTime) {
             DoSnapshot();
             snapshotTimesIndex++;
@@ -345 +345 @@
     private void FindNextSnapshotTimeIndex(TimeSpan reference) {
       var index = 0;
-      while (index < snapshotTimes.Count && (snapshotTimes[index] - reference.TotalMilliseconds) <= 0) {
+      while (index < snapshotTimes.Count && snapshotTimes[index] <= reference) {
         index++;
       };