Changeset 4115 for trunk/sources

Timestamp:

07/27/10 17:05:00 (14 years ago)

Author:

mkommend

Message:

Added correct handling of adding and removing runs in experiments and batch runs (ticket #1111).

Location:

trunk/sources/HeuristicLab.Optimization/3.3

Files:

• BatchRun.cs (modified) (4 diffs)
• Experiment.cs (modified) (3 diffs)

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

@@ -27 +27 @@
 using HeuristicLab.Data;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
+using System.Collections.Generic;
 
 namespace HeuristicLab.Optimization {
@@ -80 +81 @@
       set {
         if (algorithm != value) {
-          if (algorithm != null) DeregisterAlgorithmEvents();
+          if (algorithm != null) {
+            DeregisterAlgorithmEvents();
+            IEnumerable<IRun> runs = algorithm.Runs;
+            algorithm = null; //necessary to avoid removing the runs from the old algorithm
+            Runs.RemoveRange(runs);
+          }
           algorithm = value;
-          if (algorithm != null) RegisterAlgorithmEvents();
+          if (algorithm != null) {
+            RegisterAlgorithmEvents();
+            Runs.AddRange(algorithm.Runs);
+          }
           OnAlgorithmChanged();
           Prepare();
@@ -324 +333 @@
     private void RegisterRunsEvents() {
       runs.CollectionReset += new CollectionItemsChangedEventHandler<IRun>(Runs_CollectionReset);
+      runs.ItemsAdded += new CollectionItemsChangedEventHandler<IRun>(Runs_ItemsAdded);
       runs.ItemsRemoved += new CollectionItemsChangedEventHandler<IRun>(Runs_ItemsRemoved);
     }
+
     private void DeregisterRunsEvents() {
       runs.CollectionReset -= new CollectionItemsChangedEventHandler<IRun>(Runs_CollectionReset);
+      runs.ItemsAdded -= new CollectionItemsChangedEventHandler<IRun>(Runs_ItemsAdded);
       runs.ItemsRemoved -= new CollectionItemsChangedEventHandler<IRun>(Runs_ItemsRemoved);
     }
@@ -345 +357 @@
       }
     }
+    private void Runs_ItemsAdded(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;
+      }
+    }
     private void Runs_ItemsRemoved(object sender, CollectionItemsChangedEventArgs<IRun> e) {
       foreach (IRun run in e.Items) {

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

@@ -240 +240 @@
     }
     private void Optimizers_CollectionReset(object sender, CollectionItemsChangedEventArgs<IndexedItem<IOptimizer>> e) {
-      foreach (IndexedItem<IOptimizer> item in e.OldItems) {
-        DeregisterOptimizerEvents(item.Value);
-      }
+      foreach (IndexedItem<IOptimizer> item in e.OldItems)
+        RemoveOptimizer(item.Value);
       foreach (IndexedItem<IOptimizer> item in e.Items)
         AddOptimizer(item.Value);
@@ -251 +250 @@
     }
     private void Optimizers_ItemsRemoved(object sender, CollectionItemsChangedEventArgs<IndexedItem<IOptimizer>> e) {
-      foreach (IndexedItem<IOptimizer> item in e.Items) {
-        DeregisterOptimizerEvents(item.Value);
-      }
+      foreach (IndexedItem<IOptimizer> item in e.Items)
+        RemoveOptimizer(item.Value);
     }
     private void Optimizers_ItemsReplaced(object sender, CollectionItemsChangedEventArgs<IndexedItem<IOptimizer>> e) {
-      foreach (IndexedItem<IOptimizer> item in e.OldItems) {
-        DeregisterOptimizerEvents(item.Value);
-      }
+      foreach (IndexedItem<IOptimizer> item in e.OldItems)
+        RemoveOptimizer(item.Value);
       foreach (IndexedItem<IOptimizer> item in e.Items)
         AddOptimizer(item.Value);
@@ -266 +263 @@
       Runs.AddRange(optimizer.Runs);
       optimizer.Prepare();
+    }
+    private void RemoveOptimizer(IOptimizer optimizer) {
+      DeregisterOptimizerEvents(optimizer);
+      Runs.RemoveRange(optimizer.Runs);
     }