Changeset 5195 for trunk/sources/HeuristicLab.Optimization

Timestamp:

01/03/11 05:43:27 (14 years ago)

Author:

swagner

Message:

Cleared global scope after an EngineAlgorithm is stopped (#1355)

Location:

trunk/sources/HeuristicLab.Optimization/3.3

Files:

• EngineAlgorithm.cs (modified) (2 diffs)
• Run.cs (modified) (1 diff)

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

@@ -117 +117 @@
     private void AfterDeserialization() {
       Initialize();
+
+      // BackwardsCompatibility3.3
+      #region Backwards compatible code (remove with 3.4)
+      // clear global scope if it contains any sub-scopes or additional variables
+      if ((ExecutionState == Core.ExecutionState.Stopped) && ((globalScope.SubScopes.Count > 0) || (globalScope.Variables.Count > 1))) {
+        ResultCollection results = Results;
+        globalScope.Clear();
+        globalScope.Variables.Add(new Variable("Results", results));
+      }
+      #endregion
     }
 
@@ -212 +222 @@
     }
     private void Engine_Stopped(object sender, EventArgs e) {
+      ResultCollection results = Results;
+      globalScope.Clear();
+      globalScope.Variables.Add(new Variable("Results", results));
       OnStopped();
     }

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

@@ -95 +95 @@
         clone.CollectParameterValues(parameters);
         clone.CollectResultValues(results);
-        clone.Prepare(true);
+        clone.Runs.Clear();
         this.algorithm = clone;
       } else {