Changeset 5419

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

Files:

• HeuristicLab.Algorithms.DataAnalysis.Views/3.3/CrossValidationView.cs (modified) (2 diffs)
• HeuristicLab.Algorithms.DataAnalysis/3.3/CrossValidation.cs (modified) (1 diff)
• HeuristicLab.Optimization.Views/3.3/AlgorithmView.cs (modified) (2 diffs)
• HeuristicLab.Optimization.Views/3.3/BatchRunView.cs (modified) (2 diffs)
• HeuristicLab.Optimization.Views/3.3/ExperimentView.cs (modified) (2 diffs)
• HeuristicLab.Optimization/3.3/Algorithm.cs (modified) (2 diffs)
• HeuristicLab.Optimization/3.3/BatchRun.cs (modified) (1 diff)
• HeuristicLab.Optimization/3.3/Experiment.cs (modified) (2 diffs)
• HeuristicLab.Optimization/3.3/Interfaces/IOptimizer.cs (modified) (2 diffs)

trunk/sources/HeuristicLab.Algorithms.DataAnalysis.Views/3.3/CrossValidationView.cs

@@ -21 +21 @@
 
 using System;
+using System.Linq;
 using System.Windows.Forms;
 using HeuristicLab.Common;
@@ -102 +103 @@
     }
 
+    protected override void OnClosed(FormClosedEventArgs e) {
+      if ((Content != null) && (Content.ExecutionState == ExecutionState.Started)) {
+        //The content must be stopped if no other view showing the content is available
+        var optimizers = MainFormManager.MainForm.Views.OfType<IContentView>().Where(v => v != this).Select(v => v.Content).OfType<IOptimizer>();
+        //add nested optimizers
+        optimizers = optimizers.SelectMany(opt => opt.NestedOptimizers).Union(optimizers);
+
+        if (!optimizers.Contains(Content)) Content.Stop();
+      }
+      base.OnClosed(e);
+    }
+
     protected override void SetEnabledStateOfControls() {
       if (InvokeRequired) Invoke((Action)SetEnabledStateOfControls);

trunk/sources/HeuristicLab.Algorithms.DataAnalysis/3.3/CrossValidation.cs

@@ -165 +165 @@
     }
 
+    public IEnumerable<IOptimizer> NestedOptimizers {
+      get {
+        if (Algorithm != null) yield return Algorithm;
+        if (clonedAlgorithms != null) {
+          foreach (IAlgorithm alg in ClonedAlgorithms) {
+            yield return alg;
+            foreach (IOptimizer nested in alg.NestedOptimizers)
+              yield return nested;
+          }
+        }
+      }
+    }
+
     [Storable]
     private ResultCollection results;

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

@@ -22 +22 @@
 using System;
 using System.Collections.Generic;
+using System.Linq;
 using System.Windows.Forms;
 using HeuristicLab.Common;
@@ -133 +134 @@
 
     protected override void OnClosed(FormClosedEventArgs e) {
-      if ((Content != null) && (Content.ExecutionState == ExecutionState.Started)) Content.Stop();
+      if ((Content != null) && (Content.ExecutionState == ExecutionState.Started)) {
+        //The content must be stopped if no other view showing the content is available
+        var optimizers = MainFormManager.MainForm.Views.OfType<IContentView>().Where(v => v != this).Select(v => v.Content).OfType<IOptimizer>();
+        //add nested optimizers
+        optimizers = optimizers.SelectMany(opt => opt.NestedOptimizers).Union(optimizers);
+
+        if (!optimizers.Contains(Content)) Content.Stop();
+      }
       base.OnClosed(e);
     }

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

@@ -21 +21 @@
 
 using System;
+using System.Linq;
 using System.Windows.Forms;
 using HeuristicLab.Common;
@@ -109 +110 @@
 
     protected override void OnClosed(FormClosedEventArgs e) {
-      if ((Content != null) && (Content.ExecutionState == ExecutionState.Started)) Content.Stop();
+      if ((Content != null) && (Content.ExecutionState == ExecutionState.Started)) {
+        //The content must be stopped if no other view showing the content is available
+        var optimizers = MainFormManager.MainForm.Views.OfType<IContentView>().Where(v => v != this).Select(v => v.Content).OfType<IOptimizer>();
+        //add nested optimizers
+        optimizers = optimizers.SelectMany(opt => opt.NestedOptimizers).Union(optimizers);
+
+        if (!optimizers.Contains(Content)) Content.Stop();
+      }
       base.OnClosed(e);
     }

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

@@ -21 +21 @@
 
 using System;
+using System.Linq;
 using System.Windows.Forms;
 using HeuristicLab.Common;
@@ -91 +92 @@
 
     protected override void OnClosed(FormClosedEventArgs e) {
-      if ((Content != null) && (Content.ExecutionState == ExecutionState.Started)) Content.Stop();
+      if ((Content != null) && (Content.ExecutionState == ExecutionState.Started)) {
+        //The content must be stopped if no other view showing the content is available
+        var optimizers = MainFormManager.MainForm.Views.OfType<IContentView>().Where(v => v != this).Select(v => v.Content).OfType<IOptimizer>();
+        //add nested optimizers
+        optimizers = optimizers.SelectMany(opt => opt.NestedOptimizers).Union(optimizers);
+
+        if (!optimizers.Contains(Content)) Content.Stop();
+      }
       base.OnClosed(e);
     }

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