Changeset 7615 for branches/HeuristicLab.TimeSeries/HeuristicLab.Optimization/3.3

Timestamp:

03/15/12 09:11:17 (13 years ago)

Author:

gkronber

Message:

#1081 merged r7462:7609 from trunk into time series branch

Location:

branches/HeuristicLab.TimeSeries

Files:

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

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

@@ -240 +240 @@
     }
 
+    protected override IEnumerable<KeyValuePair<string, IItem>> GetCollectedValues(IItem value) {
+      var children = base.GetCollectedValues(value);
+      foreach (var child in children) {
+        if (child.Value is IOperator)
+          yield return new KeyValuePair<string, IItem>(child.Key, new StringValue(((IOperator)child.Value).Name));
+        else yield return child;
+      }
+    }
+
     #region Events
     public event EventHandler ExecutionStateChanged;
@@ -265 +274 @@
       ExecutionState = ExecutionState.Prepared;
       ExecutionTime = TimeSpan.Zero;
-      foreach (IStatefulItem statefulObject in this.GetObjectGraphObjects().OfType<IStatefulItem>()) {
+      foreach (IStatefulItem statefulObject in this.GetObjectGraphObjects(new HashSet<string>() { "runs" }).OfType<IStatefulItem>()) {
         statefulObject.InitializeState();
       }
@@ -286 +295 @@
     protected virtual void OnStopped() {
       ExecutionState = ExecutionState.Stopped;
-      foreach (IStatefulItem statefulObject in this.GetObjectGraphObjects().OfType<IStatefulItem>()) {
+      foreach (IStatefulItem statefulObject in this.GetObjectGraphObjects(new HashSet<string>() { "runs" }).OfType<IStatefulItem>()) {
         statefulObject.ClearState();
       }

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

@@ -339 +339 @@
     private void Optimizer_Paused(object sender, EventArgs e) {
       if (ExecutionState == ExecutionState.Started) {
-        batchRunStarted = false;
-        batchRunPaused = true;
-        batchRunStopped = false;
         OnPaused();
       }

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

@@ -337 +337 @@
     private void optimizer_Prepared(object sender, EventArgs e) {
       if (Optimizers.All(x => x.ExecutionState == ExecutionState.Prepared)) OnPrepared();
-      else if (Optimizers.All(x => x.ExecutionState != ExecutionState.Started)) OnPaused();
     }
     private void optimizer_Started(object sender, EventArgs e) {

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

@@ -26 +26 @@
 using HeuristicLab.Common;
 using HeuristicLab.Core;
+using HeuristicLab.Data;
 using HeuristicLab.Parameters;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
@@ -97 +98 @@
     #endregion
 
+    protected override IEnumerable<KeyValuePair<string, IItem>> GetCollectedValues(IItem value) {
+      var children = base.GetCollectedValues(value);
+      foreach (var child in children) {
+        if (child.Value is IOperator)
+          yield return new KeyValuePair<string, IItem>(child.Key, new StringValue(((IOperator)child.Value).Name));
+        else yield return child;
+      }
+    }
+
     #region events
     private void Operators_Changed(object sender, EventArgs e) {