Changeset 6195 for branches/histogram/HeuristicLab.Optimization

Timestamp:

05/14/11 16:45:46 (14 years ago)

Author:

abeham

Message:

#1465

• updated branch with latest version of trunk

Location:

branches/histogram

Files:

• . (modified) (1 prop)
• HeuristicLab.Optimization/3.3/Algorithms/Algorithm.cs (modified) (2 diffs)
• HeuristicLab.Optimization/3.3/HeuristicLabOptimizationPlugin.cs.frame (modified) (1 diff)
• HeuristicLab.Optimization/3.3/Problems/SingleObjectiveHeuristicOptimizationProblem.cs (modified) (1 prop)
• HeuristicLab.Optimization/3.3/Properties/AssemblyInfo.frame (modified) (1 diff)

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

@@ -260 +260 @@
     public event EventHandler Prepared;
     protected virtual void OnPrepared() {
+      ExecutionState = ExecutionState.Prepared;
       ExecutionTime = TimeSpan.Zero;
-      ExecutionState = ExecutionState.Prepared;
+      foreach (IStatefulItem statefulObject in this.GetObjectGraphObjects().OfType<IStatefulItem>()) {
+        statefulObject.InitializeState();
+      }
       EventHandler handler = Prepared;
       if (handler != null) handler(this, EventArgs.Empty);
@@ -280 +283 @@
     protected virtual void OnStopped() {
       ExecutionState = ExecutionState.Stopped;
+      foreach (IStatefulItem statefulObject in this.GetObjectGraphObjects().OfType<IStatefulItem>()) {
+        statefulObject.ClearState();
+      }
       runsCounter++;
       runs.Add(new Run(string.Format("{0} Run {1}", Name, runsCounter), this));

branches/histogram/HeuristicLab.Optimization/3.3/HeuristicLabOptimizationPlugin.cs.frame

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

branches/histogram/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.3.$WCREV$")]
+[assembly: AssemblyFileVersion("3.3.4.$WCREV$")]