Changeset 2027 for branches/Operator Architecture Refactoring/HeuristicLab.Core/3.2/Interfaces

Timestamp:

06/06/09 02:09:35 (15 years ago)

Author:

swagner

Message:

Refactoring of the operator architecture (#95)

Location:

branches/Operator Architecture Refactoring/HeuristicLab.Core/3.2/Interfaces

Files:

• IEnvironment.cs (modified) (1 diff)
• IOperator.cs (modified) (3 diffs)
• IScope.cs (modified) (4 diffs)
• IVariablesContainer.cs (added)

branches/Operator Architecture Refactoring/HeuristicLab.Core/3.2/Interfaces/IEnvironment.cs

@@ -27 +27 @@
   public interface IEnvironment : IItem {
     string TranslateName(string name);
+
+    void AddAlias(string oldName, string newName);
+    void RemoveAlias(string name);
   }
 }

branches/Operator Architecture Refactoring/HeuristicLab.Core/3.2/Interfaces/IOperator.cs

@@ -49 +49 @@
 
     /// <summary>
+    /// Gets a list of all sub operators.
+    /// </summary>
+    IList<IOperator> SubOperators { get; }
+    /// <summary>
     /// Gets a collection of all variable (parameter) infos.
     /// </summary>
     ICollection<IParameter> Parameters { get; }
+
+    /// <summary>
+    /// Adds the given sub operator to the current instance.
+    /// </summary>
+    /// <param name="op">The operator to add.</param>
+    void AddSubOperator(IOperator op);
+    /// <summary>
+    /// Adds the given sub operator at a the specified <paramref name="index"/>.
+    /// </summary>
+    /// <param name="op">The operator to add.</param>
+    /// <param name="index">The position where to add the operator.</param>
+    void AddSubOperator(IOperator op, int index);
+    /// <summary>
+    /// Removes a sub operator at the specified <paramref name="index"/>.
+    /// </summary>
+    /// <param name="index">The position where to delete the operator.</param>
+    void RemoveSubOperator(int index);
 
     /// <summary>
@@ -75 +96 @@
     /// <param name="scope">The scope where to execute the current instance.</param>
     /// <returns>The next operation.</returns>
-    IOperation Execute(IEnvironment environment, IScope scope);
+    IOperation Execute(IEnvironment env, IScope scope);
     /// <summary>
     /// Aborts the current operator.
@@ -88 +109 @@
     /// Occurs when the breakpoint flag of the current instance was changed.
     /// </summary>
-    event EventHandler BreakpointChanged; 
+    event EventHandler BreakpointChanged;
+    /// <summary>
+    /// Occurs when a sub operator has been added.
+    /// </summary>
+    event EventHandler<OperatorIndexEventArgs> SubOperatorAdded;
+    /// <summary>
+    /// Occurs when a sub operator has been deleted.
+    /// </summary>
+    event EventHandler<OperatorIndexEventArgs> SubOperatorRemoved;
     /// <summary>
     /// Occurs when a variable info has been added.

branches/Operator Architecture Refactoring/HeuristicLab.Core/3.2/Interfaces/IScope.cs

@@ -29 +29 @@
   /// Interface for a hierarchical container of variables (containing variables and subscopes). 
   /// </summary>
-  public interface IScope : IItem {
+  public interface IScope : IItem, IVariablesContainer {
     /// <summary>
     /// Gets the name of the current instance.
@@ -35 +35 @@
     string Name { get; }
 
-    /// <summary>
-    /// Gets the varibles of the current scope.
-    /// </summary>
-    ICollection<IVariable> Variables { get; }
     /// <summary>
     /// Gets all subscopes in the current scope.
@@ -50 +46 @@
     void SetParent(IScope scope);
 
-    /// <summary>
-    /// Gets a variable with the given <paramref name="name"/>.
-    /// </summary>
-    /// <param name="name">The name of the variable.</param>
-    /// <returns>The variable with the specified name.</returns>
-    IVariable GetVariable(string name);
-    /// <summary>
-    /// Adds the specified variable to the curent instance.
-    /// </summary>
-    /// <param name="variable">The variable to add.</param>
-    void AddVariable(IVariable variable);
-    /// <summary>
-    /// Deletes a variable with the specified <paramref name="name"/> from the current instance.
-    /// </summary>
-    /// <param name="name">The name of the variable to delete.</param>
-    void RemoveVariable(string name);
-    
     /// <inheritdoc cref="GetVariableValue(string, bool)"/>
     /// <typeparam name="T">The type of the value that is searched.</typeparam>
@@ -125 +104 @@
 
     /// <summary>
-    /// Occurs when a variable has been added to the current instance.
-    /// </summary>
-    event EventHandler<VariableEventArgs> VariableAdded;
-    /// <summary>
-    /// Occurs when a variable has been deleted from the current instance.
-    /// </summary>
-    event EventHandler<VariableEventArgs> VariableRemoved;
-    /// <summary>
     /// Occurs when a sub scope has been added to the current instance.
     /// </summary>