Changeset 7213 for branches/HeuristicLab.TimeSeries/HeuristicLab.Optimization

Timestamp:

12/20/11 11:45:18 (12 years ago)

Author:

gkronber

Message:

#1081 merged r7103:7209 from trunk into time series branch

Location:

branches/HeuristicLab.TimeSeries

Files:

• . (modified) (1 prop)
• HeuristicLab.Optimization/3.3/Algorithms/Algorithm.cs (modified) (2 diffs)
• HeuristicLab.Optimization/3.3/BatchRun.cs (modified) (2 diffs)
• HeuristicLab.Optimization/3.3/Experiment.cs (modified) (3 diffs)
• HeuristicLab.Optimization/3.3/Interfaces/IAnalyzer.cs (modified) (1 diff)
• HeuristicLab.Optimization/3.3/Problems/Problem.cs (modified) (1 diff)
• HeuristicLab.Optimization/3.3/Problems/UserDefinedProblem.cs (modified) (2 diffs)
• HeuristicLab.Optimization/3.3/ResultCollection.cs (modified) (1 diff)

branches/HeuristicLab.TimeSeries/HeuristicLab.Optimization/3.3/Algorithms/Algorithm.cs

@@ -37 +37 @@
   [StorableClass]
   public abstract class Algorithm : ParameterizedNamedItem, IAlgorithm {
+    public static new Image StaticItemImage {
+      get { return HeuristicLab.Common.Resources.VSImageLibrary.Event; }
+    }
     public override Image ItemImage {
       get {
@@ -43 +46 @@
         else if (ExecutionState == ExecutionState.Paused) return HeuristicLab.Common.Resources.VSImageLibrary.ExecutablePaused;
         else if (ExecutionState == ExecutionState.Stopped) return HeuristicLab.Common.Resources.VSImageLibrary.ExecutableStopped;
-        else return HeuristicLab.Common.Resources.VSImageLibrary.Event;
+        else return base.ItemImage;
       }
     }

branches/HeuristicLab.TimeSeries/HeuristicLab.Optimization/3.3/BatchRun.cs

@@ -39 +39 @@
     public string Filename { get; set; }
 
+    public static new Image StaticItemImage {
+      get { return HeuristicLab.Common.Resources.VSImageLibrary.Event; }
+    }
     public override Image ItemImage {
       get {
@@ -45 +48 @@
         else if (ExecutionState == ExecutionState.Paused) return HeuristicLab.Common.Resources.VSImageLibrary.BatchRunPaused;
         else if (ExecutionState == ExecutionState.Stopped) return HeuristicLab.Common.Resources.VSImageLibrary.BatchRunStopped;
-        else return HeuristicLab.Common.Resources.VSImageLibrary.Event;
+        else return base.ItemImage;
       }
     }

branches/HeuristicLab.TimeSeries/HeuristicLab.Optimization/3.3/Experiment.cs

@@ -39 +39 @@
     public string Filename { get; set; }
 
+    public static new Image StaticItemImage {
+      get { return HeuristicLab.Common.Resources.VSImageLibrary.Event; }
+    }
     public override Image ItemImage {
       get {
@@ -45 +48 @@
         else if (ExecutionState == ExecutionState.Paused) return HeuristicLab.Common.Resources.VSImageLibrary.ExperimentPaused;
         else if (ExecutionState == ExecutionState.Stopped) return HeuristicLab.Common.Resources.VSImageLibrary.ExperimentStopped;
-        else return HeuristicLab.Common.Resources.VSImageLibrary.Event;
+        else return base.ItemImage;
       }
     }
@@ -336 +339 @@
     private void optimizer_Stopped(object sender, EventArgs e) {
       if (experimentStopped && Optimizers.All(o => o.ExecutionState == ExecutionState.Stopped || o.ExecutionState == ExecutionState.Prepared)) OnStopped();
-      else if (Optimizers.All(o => o.ExecutionState == ExecutionState.Stopped)) OnStopped();
+      else if (Optimizers.Any(o => o.ExecutionState == ExecutionState.Stopped) && Optimizers.All(o => o.ExecutionState != ExecutionState.Started) && Optimizers.All(o => o.ExecutionState != ExecutionState.Paused)) OnStopped();
       else if (Optimizers.Any(o => o.ExecutionState == ExecutionState.Paused) && Optimizers.All(o => o.ExecutionState != ExecutionState.Started)) OnPaused();
       else if (experimentStarted && !experimentStopped && Optimizers.Any(x => (x.ExecutionState == ExecutionState.Prepared) || (x.ExecutionState == ExecutionState.Paused))) {

branches/HeuristicLab.TimeSeries/HeuristicLab.Optimization/3.3/Interfaces/IAnalyzer.cs

@@ -26 +26 @@
   /// An interface which represents an analysis operator.
   /// </summary>
-  public interface IAnalyzer : IOperator { }
+  public interface IAnalyzer : IOperator {
+    bool EnabledByDefault { get; }
+  }
 }

branches/HeuristicLab.TimeSeries/HeuristicLab.Optimization/3.3/Problems/Problem.cs

@@ -39 +39 @@
     }
 
-    public override Image ItemImage {
+    public static new Image StaticItemImage {
       get { return HeuristicLab.Common.Resources.VSImageLibrary.Type; }
     }

branches/HeuristicLab.TimeSeries/HeuristicLab.Optimization/3.3/Problems/UserDefinedProblem.cs

@@ -43 +43 @@
     public string Filename { get; set; }
 
-    public override Image ItemImage {
+    public static new Image StaticItemImage {
       get { return HeuristicLab.Common.Resources.VSImageLibrary.Type; }
     }
@@ -263 +263 @@
       #endregion
 
-      public override Image ItemImage {
+      public static new Image StaticItemImage {
         get { return HeuristicLab.Common.Resources.VSImageLibrary.Method; }
       }

branches/HeuristicLab.TimeSeries/HeuristicLab.Optimization/3.3/ResultCollection.cs

@@ -41 +41 @@
     }
 
-    public override System.Drawing.Image ItemImage {
+    public static new System.Drawing.Image StaticItemImage {
       get { return HeuristicLab.Common.Resources.VSImageLibrary.Object; }
     }