Changeset 2796 for trunk/sources/HeuristicLab.Core/3.3

Timestamp:

02/15/10 05:26:02 (14 years ago)

Author:

swagner

Message:

Operator architecture refactoring (#95)

• worked on operators, parameters and problems

Location:

trunk/sources/HeuristicLab.Core/3.3

Files:

• Engine.cs (modified) (7 diffs)
• ExecutionContext.cs (modified) (2 diffs)
• HeuristicLab.Core-3.3.csproj (modified) (2 diffs)
• Interfaces/IEngine.cs (modified) (3 diffs)
• Interfaces/ILookupParameter.cs (modified) (1 diff)
• Interfaces/IProblem.cs (added)
• Interfaces/IValueLookupParameter.cs (modified) (1 diff)
• Interfaces/IValueParameter.cs (modified) (1 diff)
• Operator.cs (moved) (moved from trunk/sources/HeuristicLab.Operators/3.3/Operator.cs) (1 diff)
• OperatorGraph.cs (modified) (1 diff)
• Problem.cs (added)
• ValueParameterCollection.cs (added)

trunk/sources/HeuristicLab.Core/3.3/Engine.cs

@@ -22 +22 @@
 using System;
 using System.Collections.Generic;
-using System.Text;
-using System.Xml;
+using System.Drawing;
 using System.Threading;
-using System.Drawing;
+using HeuristicLab.Common;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
-using HeuristicLab.Common;
 
 namespace HeuristicLab.Core {
@@ -41 +39 @@
     }
 
-    /// <summary>
-    /// Field of the current instance that represent the operator graph.
-    /// </summary>
     private OperatorGraph operatorGraph;
     /// <summary>
-    /// Gets the current operator graph.
+    /// Gets or sets the current operator graph.
     /// </summary>
     [Storable]
@@ -76 +71 @@
 
     [Storable]
+    private IProblem problem;
+    /// <summary>
+    /// Gets or sets the current problem.
+    /// </summary>
+    public IProblem Problem {
+      get { return problem; }
+      set {
+        if (value == null) throw new ArgumentNullException();
+        if (value != problem) {
+          problem = value;
+          OnProblemChanged();
+          Prepare();
+        }
+      }
+    }
+
+    [Storable]
     private TimeSpan executionTime;
     /// <summary>
@@ -134 +146 @@
     protected Engine() {
       globalScope = new Scope("Global");
+      problem = null;
       executionStack = new Stack<IExecutionSequence>();
       OperatorGraph = new OperatorGraph();
@@ -149 +162 @@
       clone.OperatorGraph = (OperatorGraph)cloner.Clone(operatorGraph);
       clone.globalScope = (Scope)cloner.Clone(globalScope);
+      clone.problem = (IProblem)cloner.Clone(problem);
       clone.executionTime = executionTime;
       IExecutionSequence[] contexts = executionStack.ToArray();
@@ -169 +183 @@
       ExecutionTime = new TimeSpan();
       executionStack.Clear();
-      if (OperatorGraph.InitialOperator != null)
-        executionStack.Push(new ExecutionContext(null, OperatorGraph.InitialOperator, GlobalScope));
+      if ((OperatorGraph.InitialOperator != null) && (Problem != null))
+        executionStack.Push(new ExecutionContext(null, OperatorGraph.InitialOperator, GlobalScope, Problem));
       OnPrepared();
     }
@@ -228 +242 @@
     }
 
+    /// <summary>
+    /// Occurs when the operator graph was changed.
+    /// </summary>
     public event EventHandler OperatorGraphChanged;
+    /// <summary>
+    /// Fires a new <c>OperatorGraphChanged</c> event.
+    /// </summary>
     protected virtual void OnOperatorGraphChanged() {
       if (OperatorGraphChanged != null)
         OperatorGraphChanged(this, EventArgs.Empty);
+    }
+    /// <summary>
+    /// Occurs when the problem was changed.
+    /// </summary>
+    public event EventHandler ProblemChanged;
+    /// <summary>
+    /// Fires a new <c>ProblemChanged</c> event.
+    /// </summary>
+    protected virtual void OnProblemChanged() {
+      if (ProblemChanged != null)
+        ProblemChanged(this, EventArgs.Empty);
     }
     /// <summary>

trunk/sources/HeuristicLab.Core/3.3/ExecutionContext.cs

@@ -45 +45 @@
     }
 
+    [Storable]
+    private IProblem problem;
+    public IProblem Problem {
+      get { return problem; }
+    }
+
     private ExecutionContext() {
       parent = null;
       op = null;
       scope = null;
+      problem = null;
     }
-    public ExecutionContext(ExecutionContext parent, IOperator op, IScope scope) {
-      if ((op == null) || (scope == null)) throw new ArgumentNullException();
+    public ExecutionContext(ExecutionContext parent, IOperator op, IScope scope, IProblem problem) {
+      if ((op == null) || (scope == null) || (problem == null)) throw new ArgumentNullException();
       this.parent = parent;
       this.op = op;
       this.scope = scope;
+      this.problem = problem;
     }
 
@@ -63 +71 @@
       clone.op = (IOperator)cloner.Clone(op);
       clone.scope = (IScope)cloner.Clone(scope);
+      clone.problem = (IProblem)cloner.Clone(problem);
       return clone;
+    }
+
+    public ExecutionContext CreateContext(IOperator op) {
+      return new ExecutionContext(parent, op, scope, problem);
+    }
+    public ExecutionContext CreateContext(IOperator op, IScope scope) {
+      return new ExecutionContext(parent, op, scope, problem);
+    }
+    public ExecutionContext CreateChildContext(IOperator op) {
+      return new ExecutionContext(this, op, scope, problem);
+    }
+    public ExecutionContext CreateChildContext(IOperator op, IScope scope) {
+      return new ExecutionContext(this, op, scope, problem);
     }
   }

trunk/sources/HeuristicLab.Core/3.3/HeuristicLab.Core-3.3.csproj

@@ -104 +104 @@
     <Compile Include="ChangedEventArgs.cs" />
     <None Include="HeuristicLabCorePlugin.cs.frame" />
+    <Compile Include="ValueParameterCollection.cs" />
+    <Compile Include="Interfaces\IProblem.cs" />
     <Compile Include="Interfaces\IExecutionSequence.cs" />
     <Compile Include="Interfaces\IValueLookupParameter.cs" />
@@ -115 +117 @@
     <Compile Include="Item.cs" />
     <Compile Include="NamedItem.cs" />
+    <Compile Include="Operator.cs" />
+    <Compile Include="Problem.cs" />
     <Compile Include="OperatorGraph.cs" />
     <Compile Include="Interfaces\IParameter.cs" />

trunk/sources/HeuristicLab.Core/3.3/Interfaces/IEngine.cs

@@ -21 +21 @@
 
 using System;
-using System.Collections.Generic;
-using System.Text;
 using HeuristicLab.Common;
 
@@ -40 +38 @@
     /// </summary>
     IScope GlobalScope { get; }
+    /// <summary>
+    /// Gets the problem of the current instance.
+    /// </summary>
+    IProblem Problem { get; set; }
 
     /// <summary>
@@ -72 +74 @@
     void Stop();
 
+    /// <summary>
+    /// Occurs when the operator graph was changed.
+    /// </summary>
     event EventHandler OperatorGraphChanged;
+    /// <summary>
+    /// Occurs when the problem was changed.
+    /// </summary>
+    event EventHandler ProblemChanged;
     /// <summary>
     /// Occurs when the execution time was changed.

trunk/sources/HeuristicLab.Core/3.3/Interfaces/ILookupParameter.cs

@@ -26 +26 @@
 
 namespace HeuristicLab.Core {
-  public interface ILookupParameter<T> : IParameter where T : class, IItem {
+  public interface ILookupParameter : IParameter {
     string ActualName { get; set; }
-
     event EventHandler ActualNameChanged;
   }
+
+  public interface ILookupParameter<T> : ILookupParameter where T : class, IItem {
+    new T ActualValue { get; set; }
+  }
 }

trunk/sources/HeuristicLab.Core/3.3/Interfaces/IValueLookupParameter.cs

@@ -26 +26 @@
 
 namespace HeuristicLab.Core {
-  public interface IValueLookupParameter<T> : IValueParameter<T>, ILookupParameter<T> where T : class, IItem { }
+  public interface IValueLookupParameter : IValueParameter, ILookupParameter { }
+
+  public interface IValueLookupParameter<T> : IValueLookupParameter, IValueParameter<T>, ILookupParameter<T> where T : class, IItem { }
 }

trunk/sources/HeuristicLab.Core/3.3/Interfaces/IValueParameter.cs

@@ -26 +26 @@
 
 namespace HeuristicLab.Core {
-  public interface IValueParameter<T> : IParameter where T : class, IItem {
-    T Value { get; set; }
-
+  public interface IValueParameter : IParameter {
+    IItem Value { get; set; }
     event EventHandler ValueChanged;
   }
+
+  public interface IValueParameter<T> : IValueParameter where T : class, IItem {
+    new T Value { get; set; }
+  }
 }

trunk/sources/HeuristicLab.Core/3.3/Operator.cs

@@ -23 +23 @@
 using System.Drawing;
 using HeuristicLab.Collections;
-using HeuristicLab.Core;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 
-namespace HeuristicLab.Operators {
+namespace HeuristicLab.Core {
   /// <summary>
   /// The base class for all operators.

trunk/sources/HeuristicLab.Core/3.3/OperatorGraph.cs

@@ -34 +34 @@
   /// </summary>
   [Item("OperatorGraph", "Represents a graph of operators.")]
-  [Creatable("Test")]
+  [Creatable("Algorithms")]
   public class OperatorGraph : Item {
     private OperatorSet operators;