Changeset 15603 for branches/GeneralizedQAP/HeuristicLab.Optimization/3.3/MetaOptimizers/Experiment.cs

Timestamp:

01/12/18 13:33:23 (6 years ago)

Author:

abeham

Message:

#1614: Implemented changed behavior to measure execution time (cf. #2869)

File:

• branches/GeneralizedQAP/HeuristicLab.Optimization/3.3/MetaOptimizers/Experiment.cs (modified) (5 diffs)

branches/GeneralizedQAP/HeuristicLab.Optimization/3.3/MetaOptimizers/Experiment.cs

@@ -70 +70 @@
     private TimeSpan executionTime;
     public TimeSpan ExecutionTime {
-      get { return executionTime; }
-      private set {
-        executionTime = value;
-        OnExecutionTimeChanged();
-      }
+      get { return executionTime + Optimizers.Aggregate(TimeSpan.Zero, (a, x) => a + x.ExecutionTime); }
     }
 
@@ -249 +245 @@
       if (handler != null) handler(this, EventArgs.Empty);
     }
+    [Obsolete("deprecated needs to be removed")]
     public event EventHandler ExecutionTimeChanged;
-    private void OnExecutionTimeChanged() {
-      EventHandler handler = ExecutionTimeChanged;
-      if (handler != null) handler(this, EventArgs.Empty);
-    }
     public event EventHandler Prepared;
     private void OnPrepared() {
@@ -334 +327 @@
     private void RegisterOptimizerEvents(IOptimizer optimizer) {
       optimizer.ExceptionOccurred += new EventHandler<EventArgs<Exception>>(optimizer_ExceptionOccurred);
-      optimizer.ExecutionTimeChanged += new EventHandler(optimizer_ExecutionTimeChanged);
       optimizer.Paused += new EventHandler(optimizer_Paused);
       optimizer.Prepared += new EventHandler(optimizer_Prepared);
@@ -345 +337 @@
     private void DeregisterOptimizerEvents(IOptimizer optimizer) {
       optimizer.ExceptionOccurred -= new EventHandler<EventArgs<Exception>>(optimizer_ExceptionOccurred);
-      optimizer.ExecutionTimeChanged -= new EventHandler(optimizer_ExecutionTimeChanged);
       optimizer.Paused -= new EventHandler(optimizer_Paused);
       optimizer.Prepared -= new EventHandler(optimizer_Prepared);
@@ -360 +351 @@
       lock (locker)
         OnExceptionOccurred(e.Value);
-    }
-    private void optimizer_ExecutionTimeChanged(object sender, EventArgs e) {
-      // only wait for maximally 100ms to acquire lock, otherwise return and don't update the execution time 
-      var success = Monitor.TryEnter(locker, 100);
-      if (!success) return;
-      try {
-        ExecutionTime = Optimizers.Aggregate(TimeSpan.Zero, (t, o) => t + o.ExecutionTime);
-      } finally {
-        Monitor.Exit(locker);
-      }
     }
     private void optimizer_Paused(object sender, EventArgs e) {