Changeset 4115 for trunk/sources/HeuristicLab.Optimization/3.3/Experiment.cs

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).

File:

• trunk/sources/HeuristicLab.Optimization/3.3/Experiment.cs (modified) (3 diffs)

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);
     }