Changeset 15721 for branches/1614_GeneralizedQAP/HeuristicLab.Optimization/3.3/MetaOptimizers/BatchRun.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/BatchRun.cs (modified) (13 diffs)

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

@@ -68 +68 @@
       }
     }
-    
+
     [Storable]
     private TimeSpan executionTime;
     public TimeSpan ExecutionTime {
-      get { return executionTime + (Optimizer?.ExecutionTime ?? TimeSpan.Zero); }
-    }
+      get {
+        if ((Optimizer != null) && (Optimizer.ExecutionState != ExecutionState.Stopped))
+          return executionTime + Optimizer.ExecutionTime;
+        else
+          return executionTime;
+      }
+      private set {
+        executionTime = value;
+        OnExecutionTimeChanged();
+      }
+    }
+
+    [Storable]
+    private TimeSpan runsExecutionTime;
 
     [Storable]
@@ -162 +174 @@
       executionState = ExecutionState.Stopped;
       executionTime = TimeSpan.Zero;
+      runsExecutionTime = TimeSpan.Zero;
       repetitions = 10;
       repetitionsCounter = 0;
@@ -171 +184 @@
       executionState = ExecutionState.Stopped;
       executionTime = TimeSpan.Zero;
+      runsExecutionTime = TimeSpan.Zero;
       repetitions = 10;
       repetitionsCounter = 0;
@@ -179 +193 @@
       executionState = ExecutionState.Stopped;
       executionTime = TimeSpan.Zero;
+      runsExecutionTime = TimeSpan.Zero;
       repetitions = 10;
       repetitionsCounter = 0;
@@ -194 +209 @@
       executionState = original.executionState;
       executionTime = original.executionTime;
+      runsExecutionTime = original.runsExecutionTime;
       optimizer = cloner.Clone(original.optimizer);
       repetitions = original.repetitions;
@@ -218 +234 @@
         throw new InvalidOperationException(string.Format("Prepare not allowed in execution state \"{0}\".", ExecutionState));
       if (Optimizer != null) {
-        executionTime = TimeSpan.Zero;
+        ExecutionTime = TimeSpan.Zero;
         RepetitionsCounter = 0;
         if (clearRuns) runs.Clear();
@@ -282 +298 @@
       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 OptimizerChanged;
     private void OnOptimizerChanged() {
@@ -335 +354 @@
     private void RegisterOptimizerEvents() {
       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 +365 @@
     private void DeregisterOptimizerEvents() {
       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);
@@ -356 +377 @@
       OnExceptionOccurred(e.Value);
     }
+    private void Optimizer_ExecutionTimeChanged(object sender, EventArgs e) {
+      OnExecutionTimeChanged();
+    }
     private void Optimizer_Paused(object sender, EventArgs e) {
       if (ExecutionState == ExecutionState.Started) {
@@ -363 +387 @@
     private void Optimizer_Prepared(object sender, EventArgs e) {
       if (batchRunAction == BatchRunAction.Prepare || ExecutionState == ExecutionState.Stopped) {
+        ExecutionTime = TimeSpan.Zero;
+        runsExecutionTime = TimeSpan.Zero;
         RepetitionsCounter = 0;
         OnPrepared();
@@ -373 +399 @@
     private void Optimizer_Stopped(object sender, EventArgs e) {
       RepetitionsCounter++;
+      ExecutionTime += runsExecutionTime;
+      runsExecutionTime = TimeSpan.Zero;
 
       if (batchRunAction == BatchRunAction.Stop) OnStopped();
@@ -407 +435 @@
     private void Runs_CollectionReset(object sender, CollectionItemsChangedEventArgs<IRun> e) {
       if (Optimizer != null) Optimizer.Runs.RemoveRange(e.OldItems);
-      executionTime += SumExecutionTimes(e.OldItems);
-      executionTime += SumExecutionTimes(e.Items);
+      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;
+      }
     }
     private void Runs_ItemsAdded(object sender, CollectionItemsChangedEventArgs<IRun> e) {
-      executionTime += SumExecutionTimes(e.Items);
+      foreach (IRun run in e.Items) {
+        IItem item;
+        run.Results.TryGetValue("Execution Time", out item);
+        TimeSpanValue executionTime = item as TimeSpanValue;
+        if (executionTime != null) {
+          if (Optimizer.ExecutionState == ExecutionState.Started)
+            runsExecutionTime += executionTime.Value;
+          else
+            ExecutionTime += executionTime.Value;
+        }
+      }
     }
     private void Runs_ItemsRemoved(object sender, CollectionItemsChangedEventArgs<IRun> e) {
       if (Optimizer != null) Optimizer.Runs.RemoveRange(e.Items);
-      executionTime -= SumExecutionTimes(e.Items);
-    }
-    private TimeSpan SumExecutionTimes(IEnumerable<IRun> runs) {
-      var sum = TimeSpan.Zero;
-      foreach (IRun run in runs) {
-        IItem item;
-        run.Results.TryGetValue("Execution Time", out item);
-        TimeSpanValue exTime = item as TimeSpanValue;
-        if (exTime != null) sum += exTime.Value;
-      }
-      return sum;
     }
     #endregion