Changeset 5420 for trunk

Timestamp:

02/04/11 02:16:08 (14 years ago)

Author:

mkommend

Message:

#1402 - Refactored OnClosed method of IOptimizer views.

Location:

trunk/sources

Files:

• HeuristicLab.Algorithms.DataAnalysis.Views/3.3/CrossValidationView.cs (modified) (1 diff)
• HeuristicLab.Algorithms.DataAnalysis/3.3/CrossValidation.cs (modified) (5 diffs)
• HeuristicLab.Optimization.Views/3.3/AlgorithmView.cs (modified) (1 diff)
• HeuristicLab.Optimization.Views/3.3/BatchRunView.cs (modified) (1 diff)
• HeuristicLab.Optimization.Views/3.3/ExperimentView.cs (modified) (1 diff)

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

@@ -107 +107 @@
         //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();
+        if (!optimizers.Contains(Content)) {
+          var nestedOptimizers = optimizers.SelectMany(opt => opt.NestedOptimizers);
+          if (!nestedOptimizers.Contains(Content)) Content.Stop();
+        }
       }
       base.OnClosed(e);

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

@@ -48 +48 @@
       algorithm = null;
       clonedAlgorithms = new ItemCollection<IAlgorithm>();
-      readOnlyClonedAlgorithms = null;
       results = new ResultCollection();
 
@@ -157 +156 @@
     [Storable]
     private ItemCollection<IAlgorithm> clonedAlgorithms;
-    private ReadOnlyItemCollection<IAlgorithm> readOnlyClonedAlgorithms;
-    public IItemCollection<IAlgorithm> ClonedAlgorithms {
-      get {
-        if (readOnlyClonedAlgorithms == null) readOnlyClonedAlgorithms = clonedAlgorithms.AsReadOnly();
-        return readOnlyClonedAlgorithms;
-      }
-    }
 
     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;
-          }
-        }
-      }
+      get { return Enumerable.Empty<IOptimizer>(); }
     }
 
@@ -316 +299 @@
     }
     private void PauseAllClonedAlgorithms() {
-      foreach (IAlgorithm clonedAlgorithm in ClonedAlgorithms) {
+      foreach (IAlgorithm clonedAlgorithm in clonedAlgorithms) {
         if (clonedAlgorithm.ExecutionState == ExecutionState.Started)
           clonedAlgorithm.Pause();
@@ -333 +316 @@
     }
     private void StopAllClonedAlgorithms() {
-      foreach (IAlgorithm clonedAlgorithm in ClonedAlgorithms) {
+      foreach (IAlgorithm clonedAlgorithm in clonedAlgorithms) {
         if (clonedAlgorithm.ExecutionState == ExecutionState.Started ||
             clonedAlgorithm.ExecutionState == ExecutionState.Paused)
@@ -360 +343 @@
     public void CollectResultValues(IDictionary<string, IItem> results) {
       Dictionary<string, List<double>> resultValues = new Dictionary<string, List<double>>();
-      IEnumerable<IRun> runs = ClonedAlgorithms.Select(alg => alg.Runs.FirstOrDefault()).Where(run => run != null);
+      IEnumerable<IRun> runs = clonedAlgorithms.Select(alg => alg.Runs.FirstOrDefault()).Where(run => run != null);
       IEnumerable<KeyValuePair<string, IItem>> resultCollections = runs.Where(x => x != null).SelectMany(x => x.Results).ToList();
 

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

@@ -137 +137 @@
         //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();
+        if (!optimizers.Contains(Content)) {
+          var nestedOptimizers = optimizers.SelectMany(opt => opt.NestedOptimizers);
+          if (!nestedOptimizers.Contains(Content)) Content.Stop();
+        }
       }
       base.OnClosed(e);

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

@@ -113 +113 @@
         //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();
+        if (!optimizers.Contains(Content)) {
+          var nestedOptimizers = optimizers.SelectMany(opt => opt.NestedOptimizers);
+          if (!nestedOptimizers.Contains(Content)) Content.Stop();
+        }
       }
       base.OnClosed(e);

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

@@ -95 +95 @@
         //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();
+        if (!optimizers.Contains(Content)) {
+          var nestedOptimizers = optimizers.SelectMany(opt => opt.NestedOptimizers);
+          if (!nestedOptimizers.Contains(Content)) Content.Stop();
+        }
       }
       base.OnClosed(e);