Changeset 5419 for trunk/sources/HeuristicLab.Optimization

Timestamp:

02/04/11 01:29:43 (14 years ago)

Author:

mkommend

Message:

#1402 - Implemented IOptmizer.NestedOptimizers and adapted optimizer views to stop their content only if no way to display the content is available.

Location:

trunk/sources/HeuristicLab.Optimization/3.3

Files:

• Algorithm.cs (modified) (2 diffs)
• BatchRun.cs (modified) (1 diff)
• Experiment.cs (modified) (2 diffs)
• Interfaces/IOptimizer.cs (modified) (2 diffs)

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

@@ -23 +23 @@
 using System.Collections.Generic;
 using System.Drawing;
+using System.Linq;
 using HeuristicLab.Collections;
 using HeuristicLab.Common;
@@ -120 +121 @@
     }
 
+    public virtual IEnumerable<IOptimizer> NestedOptimizers {
+      get { return Enumerable.Empty<IOptimizer>(); }
+    }
+
     protected Algorithm()
       : base() {

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

@@ -137 +137 @@
     }
 
+    public IEnumerable<IOptimizer> NestedOptimizers {
+      get {
+        if (Optimizer == null) yield break;
+
+        yield return Optimizer;
+        foreach (IOptimizer opt in Optimizer.NestedOptimizers)
+          yield return opt;
+      }
+    }
+
     private bool stopPending;
 

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

@@ -21 +21 @@
 
 using System;
+using System.Collections.Generic;
 using System.Drawing;
 using System.Linq;
@@ -91 +92 @@
     }
 
+    public IEnumerable<IOptimizer> NestedOptimizers {
+      get {
+        if (Optimizers == null) yield break;
+
+        foreach (IOptimizer opt in Optimizers) {
+          yield return opt;
+          foreach (IOptimizer nestedOpt in opt.NestedOptimizers)
+            yield return nestedOpt;
+        }
+      }
+    }
+
     private bool stopPending;
 

trunk/sources/HeuristicLab.Optimization/3.3/Interfaces/IOptimizer.cs

@@ -20 +20 @@
 #endregion
 
+using System.Collections.Generic;
 using HeuristicLab.Core;
 
@@ -30 +31 @@
 
     void Prepare(bool clearRuns);
+
+    IEnumerable<IOptimizer> NestedOptimizers { get; }
   }
 }