Changeset 3283 for trunk/sources/HeuristicLab.Optimization

Timestamp:

04/07/10 20:17:55 (14 years ago)

Author:

swagner

Message:

Continued work on algorithm batch processing (#947).

Location:

trunk/sources/HeuristicLab.Optimization/3.3

Files:

• Algorithm.cs (modified) (1 diff)
• EngineAlgorithm.cs (modified) (1 diff)

trunk/sources/HeuristicLab.Optimization/3.3/Algorithm.cs

@@ -183 +183 @@
     public override void CollectParameterValues(IDictionary<string, IItem> values) {
       base.CollectParameterValues(values);
-      Problem.CollectParameterValues(values);
+      if (Problem != null) Problem.CollectParameterValues(values);
     }
     public virtual void CollectResultValues(IDictionary<string, IItem> values) {

trunk/sources/HeuristicLab.Optimization/3.3/EngineAlgorithm.cs

@@ -188 +188 @@
     }
     protected virtual void OnOperatorGraphChanged() { }
+    protected override void OnStopped() {
+      if (Problem != null) {
+        foreach (IParameter param in Problem.Parameters)
+          param.ExecutionContext = null;
+      }
+      foreach (IParameter param in Parameters)
+        param.ExecutionContext = null;
+      base.OnStopped();
+    }
 
     private void RegisterEngineEvents() {