Changeset 5420 for trunk/sources/HeuristicLab.Optimization.Views

Timestamp:

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

Author:

mkommend

Message:

#1402 - Refactored OnClosed method of IOptimizer views.

Location:

trunk/sources/HeuristicLab.Optimization.Views/3.3

Files:

• AlgorithmView.cs (modified) (1 diff)
• BatchRunView.cs (modified) (1 diff)
• ExperimentView.cs (modified) (1 diff)

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