Changeset 4713

Timestamp:

11/03/10 02:04:09 (14 years ago)

Author:

abeham

Message:

#922

• fixed a cloning bug in Engine and Scope

Location:

branches/CloningRefactoring/HeuristicLab.Core/3.3

Files:

• Engine.cs (modified) (2 diffs)
• Scope.cs (modified) (2 diffs)

branches/CloningRefactoring/HeuristicLab.Core/3.3/Engine.cs

@@ -58 +58 @@
       if (original.ExecutionState == ExecutionState.Started) throw new InvalidOperationException(string.Format("Clone not allowed in execution state \"{0}\".", ExecutionState));
       log = cloner.Clone(original.log);
+      executionStack = new Stack<IOperation>();
       IOperation[] contexts = original.executionStack.ToArray();
       for (int i = contexts.Length - 1; i >= 0; i--)
@@ -63 +64 @@
       pausePending = original.pausePending;
       stopPending = original.stopPending;
+      timer = new System.Timers.Timer(100);
+      timer.AutoReset = true;
+      timer.Elapsed += new System.Timers.ElapsedEventHandler(timer_Elapsed);
     }
     protected Engine()

branches/CloningRefactoring/HeuristicLab.Core/3.3/Scope.cs

@@ -64 +64 @@
       : base(original, cloner) {
       if (original.variables.Count > 0) variables = cloner.Clone(original.variables);
+      else variables = new VariableCollection();
       if (original.subScopes.Count > 0) {
         subScopes = cloner.Clone(original.subScopes);
@@ -69 +70 @@
           child.Parent = this;
         RegisterSubScopesEvents();
-      }
+      } else subScopes = new ScopeList();
     }
     /// <summary>