Changeset 8668 for trunk/sources/HeuristicLab.Optimization.Views/3.3/ExperimentTreeView.cs

Timestamp:

09/18/12 12:56:25 (12 years ago)

Author:

mkommend

Message:

#1043: Implemented display of calculated repetitions of a batchrun in the experiment tree view by adapting the text of the batchrun node to "Batchrun-Name x/y".

File:

• trunk/sources/HeuristicLab.Optimization.Views/3.3/ExperimentTreeView.cs (modified) (5 diffs)

trunk/sources/HeuristicLab.Optimization.Views/3.3/ExperimentTreeView.cs

@@ -110 +110 @@
       } else if (batchRun != null) {
         batchRun.OptimizerChanged += new EventHandler(batchRun_OptimizerChanged);
+        batchRun.RepetetionsCounterChanged += new EventHandler(batchRun_RepetitionsCounterChanged);
+        batchRun.RepetitionsChanged += new EventHandler(batchRun_RepetitionsChanged);
       } else if (experiment != null) {
         experiment.Optimizers.ItemsAdded += new CollectionItemsChangedEventHandler<IndexedItem<IOptimizer>>(Optimizers_ItemsAdded);
@@ -132 +134 @@
       } else if (batchRun != null) {
         batchRun.OptimizerChanged -= new EventHandler(batchRun_OptimizerChanged);
+        batchRun.RepetetionsCounterChanged -= new EventHandler(batchRun_RepetitionsCounterChanged);
+        batchRun.RepetitionsChanged += new EventHandler(batchRun_RepetitionsChanged);
       } else if (experiment != null) {
         experiment.Optimizers.ItemsAdded -= new CollectionItemsChangedEventHandler<IndexedItem<IOptimizer>>(Optimizers_ItemsAdded);
@@ -225 +229 @@
     }
 
+    private void batchRun_RepetitionsCounterChanged(object sender, EventArgs e) {
+      namedItem_ToStringChanged(sender, e);
+    }
+    private void batchRun_RepetitionsChanged(object sender, EventArgs e) {
+      namedItem_ToStringChanged(sender, e);
+    }
+
     private void Optimizers_ItemsAdded(object sender, CollectionItemsChangedEventArgs<IndexedItem<IOptimizer>> e) {
       if (InvokeRequired) {
@@ -362 +373 @@
       }
       var namedItem = (INamedItem)sender;
-      foreach (TreeNode node in treeNodeTagMapping[namedItem])
+      foreach (TreeNode node in treeNodeTagMapping[namedItem]) {
         node.Text = namedItem.ToString();
+        var batchRun = namedItem as BatchRun;
+        if (batchRun != null)
+          node.Text += string.Format(" {0}/{1}", batchRun.RepetitionsCounter, batchRun.Repetitions);
+      }
     }
 
@@ -811 +826 @@
           node.Nodes.Add(childNode);
       }
+      var batchRun = optimizer as BatchRun;
+      if (batchRun != null) {
+        node.Text += string.Format(" {0}/{1}", batchRun.RepetitionsCounter, batchRun.Repetitions);
+      }
 
       List<TreeNode> nodes;