Changeset 15721 for branches/1614_GeneralizedQAP/HeuristicLab.Optimization/3.3/MetaOptimizers/Experiment.cs

Timestamp:

02/04/18 22:33:26 (6 years ago)

Author:

abeham

Message:

#1614:

• reverted r15603 by reverse merging
• added expert system plugins from #2457

File:

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

branches/1614_GeneralizedQAP/HeuristicLab.Optimization/3.3/MetaOptimizers/Experiment.cs

@@ -70 +70 @@
     private TimeSpan executionTime;
     public TimeSpan ExecutionTime {
-      get { return executionTime + Optimizers.Aggregate(TimeSpan.Zero, (a, x) => a + x.ExecutionTime); }
+      get { return executionTime; }
+      private set {
+        executionTime = value;
+        OnExecutionTimeChanged();
+      }
     }
 
@@ -278 +282 @@
       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() {
@@ -362 +369 @@
     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);
@@ -372 +380 @@
     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);
@@ -386 +395 @@
       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) {