Changeset 6618 for branches/GP.Grammar.Editor/HeuristicLab.Optimization

Timestamp:

08/01/11 17:48:53 (13 years ago)

Author:

mkommend

Message:

#1479: Integrated trunk changes.

Location:

branches/GP.Grammar.Editor/HeuristicLab.Optimization/3.3

Files:

• BatchRun.cs (modified) (2 diffs)
• Experiment.cs (modified) (1 diff)
• HeuristicLabOptimizationPlugin.cs.frame (modified) (1 diff)
• Problems/SingleObjectiveHeuristicOptimizationProblem.cs (modified) (1 prop)
• Properties/AssemblyInfo.frame (modified) (1 diff)
• ResultCollection.cs (modified) (1 diff)

branches/GP.Grammar.Editor/HeuristicLab.Optimization/3.3/BatchRun.cs

@@ -41 +41 @@
     public override Image ItemImage {
       get {
-        if (ExecutionState == ExecutionState.Prepared) return HeuristicLab.Common.Resources.VSImageLibrary.ExecutablePrepared;
-        else if (ExecutionState == ExecutionState.Started) return HeuristicLab.Common.Resources.VSImageLibrary.ExecutableStarted;
-        else if (ExecutionState == ExecutionState.Paused) return HeuristicLab.Common.Resources.VSImageLibrary.ExecutablePaused;
-        else if (ExecutionState == ExecutionState.Stopped) return HeuristicLab.Common.Resources.VSImageLibrary.ExecutableStopped;
+        if (ExecutionState == ExecutionState.Prepared) return HeuristicLab.Common.Resources.VSImageLibrary.BatchRunPrepared;
+        else if (ExecutionState == ExecutionState.Started) return HeuristicLab.Common.Resources.VSImageLibrary.BatchRunStarted;
+        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;
       }
@@ -220 +220 @@
         if (clearRuns) runs.Clear();
         Optimizer.Prepare(clearRuns);
+      } else {
+        ExecutionState = ExecutionState.Stopped;
       }
     }

branches/GP.Grammar.Editor/HeuristicLab.Optimization/3.3/Experiment.cs

@@ -41 +41 @@
     public override Image ItemImage {
       get {
-        if (ExecutionState == ExecutionState.Prepared) return HeuristicLab.Common.Resources.VSImageLibrary.ExecutablePrepared;
-        else if (ExecutionState == ExecutionState.Started) return HeuristicLab.Common.Resources.VSImageLibrary.ExecutableStarted;
-        else if (ExecutionState == ExecutionState.Paused) return HeuristicLab.Common.Resources.VSImageLibrary.ExecutablePaused;
-        else if (ExecutionState == ExecutionState.Stopped) return HeuristicLab.Common.Resources.VSImageLibrary.ExecutableStopped;
+        if (ExecutionState == ExecutionState.Prepared) return HeuristicLab.Common.Resources.VSImageLibrary.ExperimentPrepared;
+        else if (ExecutionState == ExecutionState.Started) return HeuristicLab.Common.Resources.VSImageLibrary.ExperimentStarted;
+        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;
       }

branches/GP.Grammar.Editor/HeuristicLab.Optimization/3.3/HeuristicLabOptimizationPlugin.cs.frame

@@ -26 +26 @@
   /// Plugin class for HeuristicLab.Optimization plugin.
   /// </summary>
-  [Plugin("HeuristicLab.Optimization", "3.3.4.$WCREV$")]
+  [Plugin("HeuristicLab.Optimization", "3.3.5.$WCREV$")]
   [PluginFile("HeuristicLab.Optimization-3.3.dll", PluginFileType.Assembly)]
   [PluginDependency("HeuristicLab.Collections", "3.3")]

branches/GP.Grammar.Editor/HeuristicLab.Optimization/3.3/Properties/AssemblyInfo.frame

@@ -54 +54 @@
 // by using the '*' as shown below:
 [assembly: AssemblyVersion("3.3.0.0")]
-[assembly: AssemblyFileVersion("3.3.4.$WCREV$")]
+[assembly: AssemblyFileVersion("3.3.5.$WCREV$")]

branches/GP.Grammar.Editor/HeuristicLab.Optimization/3.3/ResultCollection.cs

@@ -40 +40 @@
       return new ResultCollection(this, cloner);
     }
+
+    public override System.Drawing.Image ItemImage {
+      get { return HeuristicLab.Common.Resources.VSImageLibrary.Object; }
+    }
   }
 }