Changeset 8149 for trunk/sources/HeuristicLab.Optimization/3.3

Timestamp:

06/28/12 14:57:20 (12 years ago)

Author:

mkommend

Message:

#1884: Adapted measuring the execution time of BatchRuns to behave in a similar way as it is the case of the Experiment.

File:

• trunk/sources/HeuristicLab.Optimization/3.3/BatchRun.cs (modified) (9 diffs)

trunk/sources/HeuristicLab.Optimization/3.3/BatchRun.cs

@@ -81 +81 @@
 
     [Storable]
+    private TimeSpan runsExecutionTime;
+
+    [Storable]
     private IOptimizer optimizer;
     public IOptimizer Optimizer {
@@ -160 +163 @@
       executionState = ExecutionState.Stopped;
       executionTime = TimeSpan.Zero;
+      runsExecutionTime = TimeSpan.Zero;
       repetitions = 10;
       repetitionsCounter = 0;
@@ -169 +173 @@
       executionState = ExecutionState.Stopped;
       executionTime = TimeSpan.Zero;
+      runsExecutionTime = TimeSpan.Zero;
       repetitions = 10;
       repetitionsCounter = 0;
@@ -177 +182 @@
       executionState = ExecutionState.Stopped;
       executionTime = TimeSpan.Zero;
+      runsExecutionTime = TimeSpan.Zero;
       repetitions = 10;
       repetitionsCounter = 0;
@@ -192 +198 @@
       executionState = original.executionState;
       executionTime = original.executionTime;
+      runsExecutionTime = original.runsExecutionTime;
       optimizer = cloner.Clone(original.optimizer);
       repetitions = original.repetitions;
@@ -218 +225 @@
         throw new InvalidOperationException(string.Format("Prepare not allowed in execution state \"{0}\".", ExecutionState));
       if (Optimizer != null) {
+        ExecutionTime = TimeSpan.Zero;
         repetitionsCounter = 0;
         if (clearRuns) runs.Clear();
@@ -353 +361 @@
     private void Optimizer_Stopped(object sender, EventArgs e) {
       repetitionsCounter++;
+      ExecutionTime += runsExecutionTime;
+      runsExecutionTime = TimeSpan.Zero;
 
       if (batchRunStopped) OnStopped();
@@ -385 +395 @@
     }
     private void Runs_CollectionReset(object sender, CollectionItemsChangedEventArgs<IRun> e) {
-      foreach (IRun run in e.OldItems) {
-        IItem item;
-        run.Results.TryGetValue("Execution Time", out item);
-        TimeSpanValue executionTime = item as TimeSpanValue;
-        if (executionTime != null) ExecutionTime -= executionTime.Value;
-      }
       if (Optimizer != null) Optimizer.Runs.RemoveRange(e.OldItems);
       foreach (IRun run in e.Items) {
@@ -404 +408 @@
         run.Results.TryGetValue("Execution Time", out item);
         TimeSpanValue executionTime = item as TimeSpanValue;
-        if (executionTime != null) ExecutionTime += executionTime.Value;
+        if (executionTime != null) {
+          if (Optimizer.ExecutionState == ExecutionState.Started)
+            runsExecutionTime += executionTime.Value;
+          else
+            ExecutionTime += executionTime.Value;
+        }
       }
     }
     private void Runs_ItemsRemoved(object sender, CollectionItemsChangedEventArgs<IRun> e) {
-      foreach (IRun run in e.Items) {
-        IItem item;
-        run.Results.TryGetValue("Execution Time", out item);
-        TimeSpanValue executionTime = item as TimeSpanValue;
-        if (executionTime != null) ExecutionTime -= executionTime.Value;
-      }
       if (Optimizer != null) Optimizer.Runs.RemoveRange(e.Items);
     }