Changeset 1994 for branches/Operator Architecture Refactoring/HeuristicLab.Core/3.2/AtomicOperation.cs

Timestamp:

06/03/09 02:40:39 (15 years ago)

Author:

swagner

Message:

Refactoring of the operator architecture (#95)

File:

• branches/Operator Architecture Refactoring/HeuristicLab.Core/3.2/AtomicOperation.cs (modified) (7 diffs)

branches/Operator Architecture Refactoring/HeuristicLab.Core/3.2/AtomicOperation.cs

@@ -37 +37 @@
       get { return myOperator; }
     }
-    private IScope myScope;  
+    private IEnvironment myEnvironment;
+    /// <summary>
+    /// Gets the current environment as <see cref="IEnvironment"/>.
+    /// </summary>
+    public IEnvironment Environment {
+      get { return myEnvironment; }
+    }
+    private IScope myScope;
     /// <summary>
     /// Gets the current scope as <see cref="IScope"/>.
@@ -54 +61 @@
     /// </summary>
     /// <param name="op">The operator to assign.</param>
+    /// <param name="environment">The environment to assign.</param>
     /// <param name="scope">The scope to assign.</param>
-    public AtomicOperation(IOperator op, IScope scope) {
+    public AtomicOperation(IOperator op, IEnvironment environment, IScope scope) {
       myOperator = op;
+      myEnvironment = environment;
       myScope = scope;
     }
@@ -71 +80 @@
       clonedObjects.Add(Guid, clone);
       clone.myOperator = (IOperator)Auxiliary.Clone(Operator, clonedObjects);
+      clone.myEnvironment = (IEnvironment)Auxiliary.Clone(Environment, clonedObjects);
       clone.myScope = (IScope)Auxiliary.Clone(Scope, clonedObjects);
       return clone;
@@ -83 +93 @@
     /// class <see cref="ItemBase"/>. <br/>
     /// The operator is saved as child node having the tag name <c>Operator</c>.<br/>
+    /// The environment is also saved as a child node having the tag name <c>Environment</c>.<br/>
     /// The scope is also saved as a child node having the tag name <c>Scope</c>.</remarks>
     /// <param name="name">The (tag)name of the <see cref="XmlNode"/>.</param>
@@ -91 +102 @@
       XmlNode node = base.GetXmlNode(name, document, persistedObjects);
       node.AppendChild(PersistenceManager.Persist("Operator", Operator, document, persistedObjects));
+      node.AppendChild(PersistenceManager.Persist("Environment", Environment, document, persistedObjects));
       node.AppendChild(PersistenceManager.Persist("Scope", Scope, document, persistedObjects));
       return node;
@@ -99 +111 @@
     /// <remarks>Calls <see cref="HeuristicLab.Core.StorableBase.Populate"/> of base class 
     /// <see cref="ItemBase"/>.<br/>
-    /// The operator must be saved as a child node with the tag name <c>Operator</c>, also the scope must 
+    /// The operator must be saved as a child node with the tag name <c>Operator</c>, the environment must be saved as
+    /// a child node with the tag name <c>Environment</c>, and also the scope must 
     /// be saved as a child node having the tag name <c>Scope</c> (see <see cref="GetXmlNode"/>).</remarks>
     /// <param name="node">The <see cref="XmlNode"/> where the operation is saved.</param>
@@ -106 +119 @@
       base.Populate(node, restoredObjects);
       myOperator = (IOperator)PersistenceManager.Restore(node.SelectSingleNode("Operator"), restoredObjects);
+      myEnvironment = (IEnvironment)PersistenceManager.Restore(node.SelectSingleNode("Environment"), restoredObjects);
       myScope = (IScope)PersistenceManager.Restore(node.SelectSingleNode("Scope"), restoredObjects);
     }