Changeset 8668 for trunk/sources

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

Location:

trunk/sources

Files:

• HeuristicLab.Optimization.Views/3.3/ExperimentTreeView.cs (modified) (5 diffs)
• HeuristicLab.Optimization/3.3/BatchRun.cs (modified) (8 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;

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

@@ -130 +130 @@
     [Storable]
     private int repetitionsCounter;
+    public int RepetitionsCounter {
+      get { return repetitionsCounter; }
+      private set {
+        if (value != repetitionsCounter) {
+          repetitionsCounter = value;
+          OnRepetitionsCounterChanged();
+        }
+      }
+    }
 
     [Storable]
@@ -224 +233 @@
       if (Optimizer != null) {
         ExecutionTime = TimeSpan.Zero;
-        repetitionsCounter = 0;
+        RepetitionsCounter = 0;
         if (clearRuns) runs.Clear();
         batchRunAction = BatchRunAction.Prepare;
         // a race-condition may occur when the optimizer has changed the state by itself in the meantime
-        try { Optimizer.Prepare(clearRuns); } catch (InvalidOperationException) { }
+        try { Optimizer.Prepare(clearRuns); }
+        catch (InvalidOperationException) { }
       } else {
         ExecutionState = ExecutionState.Stopped;
@@ -240 +250 @@
       if (Optimizer.ExecutionState == ExecutionState.Stopped) Optimizer.Prepare();
       // a race-condition may occur when the optimizer has changed the state by itself in the meantime
-      try { Optimizer.Start(); } catch (InvalidOperationException) { }
+      try { Optimizer.Start(); }
+      catch (InvalidOperationException) { }
     }
     public void Pause() {
@@ -249 +260 @@
       if (Optimizer.ExecutionState != ExecutionState.Started) return;
       // a race-condition may occur when the optimizer has changed the state by itself in the meantime
-      try { Optimizer.Pause(); } catch (InvalidOperationException) { }
+      try { Optimizer.Pause(); }
+      catch (InvalidOperationException) { }
     }
     public void Stop() {
@@ -261 +273 @@
       }
       // a race-condition may occur when the optimizer has changed the state by itself in the meantime
-      try { Optimizer.Stop(); } catch (InvalidOperationException) { }
+      try { Optimizer.Stop(); }
+      catch (InvalidOperationException) { }
     }
 
@@ -283 +296 @@
     private void OnRepetitionsChanged() {
       EventHandler handler = RepetitionsChanged;
+      if (handler != null) handler(this, EventArgs.Empty);
+    }
+    public event EventHandler RepetetionsCounterChanged;
+    private void OnRepetitionsCounterChanged() {
+      EventHandler handler = RepetetionsCounterChanged;
       if (handler != null) handler(this, EventArgs.Empty);
     }
@@ -356 +374 @@
         ExecutionTime = TimeSpan.Zero;
         runsExecutionTime = TimeSpan.Zero;
-        repetitionsCounter = 0;
+        RepetitionsCounter = 0;
         OnPrepared();
       }
@@ -365 +383 @@
     }
     private void Optimizer_Stopped(object sender, EventArgs e) {
-      repetitionsCounter++;
+      RepetitionsCounter++;
       ExecutionTime += runsExecutionTime;
       runsExecutionTime = TimeSpan.Zero;