Changeset 2834

Timestamp:

02/19/10 06:19:16 (14 years ago)

Author:

swagner

Message:

Operator architecture refactoring (#95)

• worked on operators, engines, and optimization

Location:

trunk/sources

Files:

• HeuristicLab 3.3.sln (modified) (2 diffs)
• HeuristicLab 3.3/Files.txt (modified) (1 diff)
• HeuristicLab.Core.Views/3.3/EngineView.Designer.cs (modified) (8 diffs)
• HeuristicLab.Core.Views/3.3/EngineView.cs (modified) (9 diffs)
• HeuristicLab.Core.Views/3.3/HeuristicLab.Core.Views-3.3.csproj (modified) (1 diff)
• HeuristicLab.Core/3.3/Engine.cs (modified) (7 diffs)
• HeuristicLab.Core/3.3/ExecutionContext.cs (modified) (3 diffs)
• HeuristicLab.Core/3.3/HeuristicLab.Core-3.3.csproj (modified) (3 diffs)
• HeuristicLab.Core/3.3/Interfaces/IAtomicOperation.cs (added)
• HeuristicLab.Core/3.3/Interfaces/IEngine.cs (modified) (3 diffs)
• HeuristicLab.Core/3.3/Interfaces/IExecutionContext.cs (added)
• HeuristicLab.Core/3.3/Interfaces/IOperation.cs (moved) (moved from trunk/sources/HeuristicLab.Core/3.3/Interfaces/IExecutionSequence.cs) (1 diff)
• HeuristicLab.Core/3.3/Interfaces/IOperator.cs (modified) (3 diffs)
• HeuristicLab.Core/3.3/Interfaces/IParameter.cs (modified) (2 diffs)
• HeuristicLab.Core/3.3/Interfaces/IParameterizedItem.cs (added)
• HeuristicLab.Core/3.3/NamedItemCollection.cs (modified) (1 diff)
• HeuristicLab.Core/3.3/OperationCollection.cs (moved) (moved from trunk/sources/HeuristicLab.Core/3.3/ExecutionContextCollection.cs) (3 diffs)
• HeuristicLab.Evolutionary/3.3/ChildrenCreator.cs (modified) (1 diff)
• HeuristicLab.Evolutionary/3.3/PopulationCreator.cs (modified) (2 diffs)
• HeuristicLab.Operators.Views/3.3/AlgorithmOperatorView.cs (modified) (1 diff)
• HeuristicLab.Operators/3.3/AlgorithmOperator.cs (modified) (1 diff)
• HeuristicLab.Operators/3.3/Assigner.cs (modified) (1 diff)
• HeuristicLab.Operators/3.3/CombinedOperator.cs (modified) (3 diffs)
• HeuristicLab.Operators/3.3/Comparator.cs (modified) (1 diff)
• HeuristicLab.Operators/3.3/ConditionalBranch.cs (modified) (1 diff)
• HeuristicLab.Operators/3.3/DoubleCounter.cs (modified) (1 diff)
• HeuristicLab.Operators/3.3/IntCounter.cs (modified) (1 diff)
• HeuristicLab.Operators/3.3/Operator.cs (modified) (5 diffs)
• HeuristicLab.Operators/3.3/ParallelSubScopesProcessor.cs (modified) (1 diff)
• HeuristicLab.Operators/3.3/Placeholder.cs (modified) (1 diff)
• HeuristicLab.Operators/3.3/ScopeCleaner.cs (modified) (1 diff)
• HeuristicLab.Operators/3.3/SequentialSubScopesProcessor.cs (modified) (1 diff)
• HeuristicLab.Operators/3.3/SingleSuccessorOperator.cs (modified) (1 diff)
• HeuristicLab.Operators/3.3/StochasticBranch.cs (modified) (1 diff)
• HeuristicLab.Operators/3.3/SubScopesCreator.cs (modified) (1 diff)
• HeuristicLab.Operators/3.3/SubScopesRemover.cs (modified) (1 diff)
• HeuristicLab.Operators/3.3/SubScopesSorter.cs (modified) (1 diff)
• HeuristicLab.Operators/3.3/UniformParallelSubScopesProcessor.cs (modified) (1 diff)
• HeuristicLab.Operators/3.3/UniformSequentialSubScopesProcessor.cs (modified) (1 diff)
• HeuristicLab.Operators/3.3/VariableCreator.cs (modified) (1 diff)
• HeuristicLab.Optimization (added)
• HeuristicLab.Optimization.Views (added)
• HeuristicLab.Optimization.Views/3.3 (added)
• HeuristicLab.Optimization.Views/3.3/HeuristicLab.Optimization.Views-3.3.csproj (added)
• HeuristicLab.Optimization.Views/3.3/HeuristicLab.snk (added)
• HeuristicLab.Optimization.Views/3.3/HeuristicLabOptimizationViewsPlugin.cs.frame (added)
• HeuristicLab.Optimization.Views/3.3/ProblemView.Designer.cs (moved) (moved from trunk/sources/HeuristicLab.Core.Views/3.3/ProblemView.Designer.cs) (5 diffs)
• HeuristicLab.Optimization.Views/3.3/ProblemView.cs (moved) (moved from trunk/sources/HeuristicLab.Core.Views/3.3/ProblemView.cs) (2 diffs)
• HeuristicLab.Optimization.Views/3.3/Properties (added)
• HeuristicLab.Optimization.Views/3.3/Properties/AssemblyInfo.frame (added)
• HeuristicLab.Optimization/3.3 (added)
• HeuristicLab.Optimization/3.3/HeuristicLab.Optimization-3.3.csproj (added)
• HeuristicLab.Optimization/3.3/HeuristicLab.snk (added)
• HeuristicLab.Optimization/3.3/HeuristicLabOptimizationPlugin.cs.frame (added)
• HeuristicLab.Optimization/3.3/IProblem.cs (moved) (moved from trunk/sources/HeuristicLab.Core/3.3/Interfaces/IProblem.cs) (1 diff)
• HeuristicLab.Optimization/3.3/Problem.cs (moved) (moved from trunk/sources/HeuristicLab.Core/3.3/Problem.cs) (5 diffs)
• HeuristicLab.Optimization/3.3/Properties (added)
• HeuristicLab.Optimization/3.3/Properties/AssemblyInfo.frame (added)
• HeuristicLab.Parameters/3.3/LookupParameter.cs (modified) (6 diffs)
• HeuristicLab.Parameters/3.3/Parameter.cs (modified) (2 diffs)
• HeuristicLab.Permutation/3.3/PermutationCrossover.cs (modified) (1 diff)
• HeuristicLab.Permutation/3.3/PermutationManipulator.cs (modified) (1 diff)
• HeuristicLab.Permutation/3.3/RandomPermutationCreator.cs (modified) (1 diff)
• HeuristicLab.Random/3.3/RandomCreator.cs (modified) (1 diff)
• HeuristicLab.Routing.TSP.Views/3.3/HeuristicLab.Routing.TSP.Views-3.3.csproj (modified) (1 diff)
• HeuristicLab.Routing.TSP.Views/3.3/HeuristicLabRoutingTSPViewsPlugin.cs.frame (modified) (1 diff)
• HeuristicLab.Routing.TSP.Views/3.3/TSPView.Designer.cs (modified) (2 diffs)
• HeuristicLab.Routing.TSP.Views/3.3/TSPView.cs (modified) (1 diff)
• HeuristicLab.Routing.TSP/3.3/HeuristicLab.Routing.TSP-3.3.csproj (modified) (1 diff)
• HeuristicLab.Routing.TSP/3.3/HeuristicLabRoutingTSPPlugin.cs.frame (modified) (1 diff)
• HeuristicLab.Routing.TSP/3.3/TSP.cs (modified) (1 diff)
• HeuristicLab.Routing.TSP/3.3/TSPDistanceMatrixPathEvaluator.cs (modified) (1 diff)
• HeuristicLab.Routing.TSP/3.3/TSPPathEvaluator.cs (modified) (1 diff)
• HeuristicLab.SGA/3.3/SGAOperator.cs (modified) (1 diff)
• HeuristicLab.Selection/3.3/Reducer.cs (modified) (1 diff)
• HeuristicLab.Selection/3.3/Selector.cs (modified) (1 diff)
• HeuristicLab.SequentialEngine/3.3/SequentialEngine.cs (modified) (2 diffs)

trunk/sources/HeuristicLab 3.3.sln

@@ -151 +151 @@
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.SGA-3.3.Tests", "HeuristicLab.SGA\3.3\Tests\HeuristicLab.SGA-3.3.Tests.csproj", "{F42F3576-7233-4B28-90F7-36AE15F30F92}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Optimization-3.3", "HeuristicLab.Optimization\3.3\HeuristicLab.Optimization-3.3.csproj", "{14AB8D24-25BC-400C-A846-4627AA945192}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Optimization.Views-3.3", "HeuristicLab.Optimization.Views\3.3\HeuristicLab.Optimization.Views-3.3.csproj", "{662B4B15-8F4D-4AE5-B3EB-D91C215F5AF2}"
 EndProject
 Global
@@ -675 +679 @@
     {F42F3576-7233-4B28-90F7-36AE15F30F92}.Release|x64.ActiveCfg = Release|Any CPU
     {F42F3576-7233-4B28-90F7-36AE15F30F92}.Release|x86.ActiveCfg = Release|Any CPU
+    {14AB8D24-25BC-400C-A846-4627AA945192}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+    {14AB8D24-25BC-400C-A846-4627AA945192}.Debug|Any CPU.Build.0 = Debug|Any CPU
+    {14AB8D24-25BC-400C-A846-4627AA945192}.Debug|x64.ActiveCfg = Debug|Any CPU
+    {14AB8D24-25BC-400C-A846-4627AA945192}.Debug|x86.ActiveCfg = Debug|Any CPU
+    {14AB8D24-25BC-400C-A846-4627AA945192}.Release|Any CPU.ActiveCfg = Release|Any CPU
+    {14AB8D24-25BC-400C-A846-4627AA945192}.Release|Any CPU.Build.0 = Release|Any CPU
+    {14AB8D24-25BC-400C-A846-4627AA945192}.Release|x64.ActiveCfg = Release|Any CPU
+    {14AB8D24-25BC-400C-A846-4627AA945192}.Release|x86.ActiveCfg = Release|Any CPU
+    {662B4B15-8F4D-4AE5-B3EB-D91C215F5AF2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+    {662B4B15-8F4D-4AE5-B3EB-D91C215F5AF2}.Debug|Any CPU.Build.0 = Debug|Any CPU
+    {662B4B15-8F4D-4AE5-B3EB-D91C215F5AF2}.Debug|x64.ActiveCfg = Debug|Any CPU
+    {662B4B15-8F4D-4AE5-B3EB-D91C215F5AF2}.Debug|x86.ActiveCfg = Debug|Any CPU
+    {662B4B15-8F4D-4AE5-B3EB-D91C215F5AF2}.Release|Any CPU.ActiveCfg = Release|Any CPU
+    {662B4B15-8F4D-4AE5-B3EB-D91C215F5AF2}.Release|Any CPU.Build.0 = Release|Any CPU
+    {662B4B15-8F4D-4AE5-B3EB-D91C215F5AF2}.Release|x64.ActiveCfg = Release|Any CPU
+    {662B4B15-8F4D-4AE5-B3EB-D91C215F5AF2}.Release|x86.ActiveCfg = Release|Any CPU
   EndGlobalSection
   GlobalSection(SolutionProperties) = preSolution

trunk/sources/HeuristicLab 3.3/Files.txt

@@ -23 +23 @@
 HeuristicLab.Operators.Views.GraphVisualization\3.3:HeuristicLab.Operators.Views.GraphVisualization-3.3.dll 
 HeuristicLab.Operators.Programmable\3.3:HeuristicLab.Operators.Programmable-3.3.dll 
+HeuristicLab.Optimization\3.3:HeuristicLab.Optimization-3.3.dll 
+HeuristicLab.Optimization.Views\3.3:HeuristicLab.Optimization.Views-3.3.dll 
 HeuristicLab.Optimizer\3.3:HeuristicLab.Optimizer-3.3.dll 
 HeuristicLab.Parameters\3.3:HeuristicLab.Parameters-3.3.dll 

trunk/sources/HeuristicLab.Core.Views/3.3/EngineView.Designer.cs

@@ -54 +54 @@
       this.startButton = new System.Windows.Forms.Button();
       this.toolTip = new System.Windows.Forms.ToolTip(this.components);
-      this.newProblemButton = new System.Windows.Forms.Button();
-      this.openProblemButton = new System.Windows.Forms.Button();
-      this.saveProblemButton = new System.Windows.Forms.Button();
       this.newOperatorGraphButton = new System.Windows.Forms.Button();
       this.openOperatorGraphButton = new System.Windows.Forms.Button();
@@ -64 +61 @@
       this.operatorGraphViewHost = new HeuristicLab.Core.Views.ViewHost();
       this.globalScopeTabPage = new System.Windows.Forms.TabPage();
-      this.problemTabPage = new System.Windows.Forms.TabPage();
-      this.problemViewHost = new HeuristicLab.Core.Views.ViewHost();
       this.openFileDialog = new System.Windows.Forms.OpenFileDialog();
       this.saveFileDialog = new System.Windows.Forms.SaveFileDialog();
@@ -71 +66 @@
       this.operatorGraphTabPage.SuspendLayout();
       this.globalScopeTabPage.SuspendLayout();
-      this.problemTabPage.SuspendLayout();
       this.SuspendLayout();
       // 
@@ -142 +136 @@
       this.startButton.Click += new System.EventHandler(this.startButton_Click);
       // 
-      // newProblemButton
-      // 
-      this.newProblemButton.Image = HeuristicLab.Common.Resources.VS2008ImageLibrary.NewDocument;
-      this.newProblemButton.Location = new System.Drawing.Point(6, 6);
-      this.newProblemButton.Name = "newProblemButton";
-      this.newProblemButton.Size = new System.Drawing.Size(24, 24);
-      this.newProblemButton.TabIndex = 0;
-      this.toolTip.SetToolTip(this.newProblemButton, "Create New Problem");
-      this.newProblemButton.UseVisualStyleBackColor = true;
-      this.newProblemButton.Click += new System.EventHandler(this.newProblemButton_Click);
-      // 
-      // openProblemButton
-      // 
-      this.openProblemButton.Image = HeuristicLab.Common.Resources.VS2008ImageLibrary.Open;
-      this.openProblemButton.Location = new System.Drawing.Point(36, 6);
-      this.openProblemButton.Name = "openProblemButton";
-      this.openProblemButton.Size = new System.Drawing.Size(24, 24);
-      this.openProblemButton.TabIndex = 1;
-      this.toolTip.SetToolTip(this.openProblemButton, "Open Problem");
-      this.openProblemButton.UseVisualStyleBackColor = true;
-      this.openProblemButton.Click += new System.EventHandler(this.openProblemButton_Click);
-      // 
-      // saveProblemButton
-      // 
-      this.saveProblemButton.Image = HeuristicLab.Common.Resources.VS2008ImageLibrary.Save;
-      this.saveProblemButton.Location = new System.Drawing.Point(66, 6);
-      this.saveProblemButton.Name = "saveProblemButton";
-      this.saveProblemButton.Size = new System.Drawing.Size(24, 24);
-      this.saveProblemButton.TabIndex = 2;
-      this.toolTip.SetToolTip(this.saveProblemButton, "Save Problem");
-      this.saveProblemButton.UseVisualStyleBackColor = true;
-      this.saveProblemButton.Click += new System.EventHandler(this.saveProblemButton_Click);
-      // 
       // newOperatorGraphButton
       // 
@@ -215 +176 @@
       this.tabControl.Controls.Add(this.operatorGraphTabPage);
       this.tabControl.Controls.Add(this.globalScopeTabPage);
-      this.tabControl.Controls.Add(this.problemTabPage);
       this.tabControl.Location = new System.Drawing.Point(0, 0);
       this.tabControl.Name = "tabControl";
@@ -258 +218 @@
       this.globalScopeTabPage.Text = "Global Scope";
       this.globalScopeTabPage.UseVisualStyleBackColor = true;
-      // 
-      // problemTabPage
-      // 
-      this.problemTabPage.Controls.Add(this.saveProblemButton);
-      this.problemTabPage.Controls.Add(this.openProblemButton);
-      this.problemTabPage.Controls.Add(this.newProblemButton);
-      this.problemTabPage.Controls.Add(this.problemViewHost);
-      this.problemTabPage.Location = new System.Drawing.Point(4, 22);
-      this.problemTabPage.Name = "problemTabPage";
-      this.problemTabPage.Padding = new System.Windows.Forms.Padding(3);
-      this.problemTabPage.Size = new System.Drawing.Size(794, 584);
-      this.problemTabPage.TabIndex = 2;
-      this.problemTabPage.Text = "Problem";
-      this.problemTabPage.UseVisualStyleBackColor = true;
-      // 
-      // problemViewHost
-      // 
-      this.problemViewHost.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
-                  | System.Windows.Forms.AnchorStyles.Left)
-                  | System.Windows.Forms.AnchorStyles.Right)));
-      this.problemViewHost.Content = null;
-      this.problemViewHost.Location = new System.Drawing.Point(6, 36);
-      this.problemViewHost.Name = "problemViewHost";
-      this.problemViewHost.Size = new System.Drawing.Size(782, 542);
-      this.problemViewHost.TabIndex = 3;
-      this.problemViewHost.ViewType = null;
       // 
       // openFileDialog
@@ -315 +249 @@
       this.operatorGraphTabPage.ResumeLayout(false);
       this.globalScopeTabPage.ResumeLayout(false);
-      this.problemTabPage.ResumeLayout(false);
       this.ResumeLayout(false);
       this.PerformLayout();
@@ -332 +265 @@
     protected System.Windows.Forms.TabControl tabControl;
     protected System.Windows.Forms.TabPage globalScopeTabPage;
-    protected System.Windows.Forms.TabPage problemTabPage;
-    protected ViewHost problemViewHost;
-    protected System.Windows.Forms.Button newProblemButton;
-    protected System.Windows.Forms.Button saveProblemButton;
-    protected System.Windows.Forms.Button openProblemButton;
     protected System.Windows.Forms.OpenFileDialog openFileDialog;
     protected System.Windows.Forms.SaveFileDialog saveFileDialog;

trunk/sources/HeuristicLab.Core.Views/3.3/EngineView.cs

@@ -62 +62 @@
     protected override void DeregisterContentEvents() {
       Content.OperatorGraphChanged -= new EventHandler(Content_OperatorGraphChanged);
-      Content.ProblemChanged -= new EventHandler(Content_ProblemChanged);
       Content.Prepared -= new EventHandler(Content_Prepared);
       Content.Started -= new EventHandler(Content_Started);
@@ -78 +77 @@
       base.RegisterContentEvents();
       Content.OperatorGraphChanged += new EventHandler(Content_OperatorGraphChanged);
-      Content.ProblemChanged += new EventHandler(Content_ProblemChanged);
       Content.Prepared += new EventHandler(Content_Prepared);
       Content.Started += new EventHandler(Content_Started);
@@ -97 +95 @@
         operatorGraphViewHost.Enabled = false;
         scopeView.Enabled = false;
-        newProblemButton.Enabled = openProblemButton.Enabled = saveProblemButton.Enabled = false;
-        problemViewHost.Enabled = false;
         startButton.Enabled = resetButton.Enabled = false;
         executionTimeTextBox.Enabled = false;
@@ -107 +103 @@
         scopeView.Content = Content.GlobalScope;
         scopeView.Enabled = true;
-        newProblemButton.Enabled = openProblemButton.Enabled = true;
-        saveProblemButton.Enabled = Content.Problem != null;
-        problemViewHost.Content = Content.Problem;
-        problemViewHost.Enabled = true;
         startButton.Enabled = !Content.Finished;
         resetButton.Enabled = true;
@@ -124 +116 @@
       else
         operatorGraphViewHost.Content = Content.OperatorGraph;
-    }
-    protected void Content_ProblemChanged(object sender, EventArgs e) {
-      if (InvokeRequired)
-        Invoke(new EventHandler(Content_ProblemChanged), sender, e);
-      else {
-        saveProblemButton.Enabled = Content.Problem != null;
-        problemViewHost.Content = Content.Problem;
-      }
     }
     protected virtual void Content_Prepared(object sender, EventArgs e) {
@@ -140 +124 @@
         operatorGraphViewHost.Enabled = true;
         scopeView.Enabled = true;
-        newProblemButton.Enabled = openProblemButton.Enabled = true;
-        saveProblemButton.Enabled = Content.Problem != null;
-        problemViewHost.Enabled = true;
         startButton.Enabled = !Content.Finished;
         stopButton.Enabled = false;
@@ -157 +138 @@
         operatorGraphViewHost.Enabled = false;
         scopeView.Enabled = false;
-        newProblemButton.Enabled = openProblemButton.Enabled = saveProblemButton.Enabled = false;
-        problemViewHost.Enabled = false;
         startButton.Enabled = false;
         stopButton.Enabled = true;
@@ -172 +151 @@
         operatorGraphViewHost.Enabled = true;
         scopeView.Enabled = true;
-        newProblemButton.Enabled = openProblemButton.Enabled = true;
-        saveProblemButton.Enabled = Content.Problem != null;
-        problemViewHost.Enabled = true;
         startButton.Enabled = !Content.Finished;
         stopButton.Enabled = false;
@@ -230 +206 @@
       }
     }
-    protected void newProblemButton_Click(object sender, EventArgs e) {
-      if (typeSelectorDialog == null) {
-        typeSelectorDialog = new TypeSelectorDialog();
-      }
-      typeSelectorDialog.Caption = "Select Problem";
-      typeSelectorDialog.TypeSelector.Configure(typeof(IProblem), false, false);
-
-      if (typeSelectorDialog.ShowDialog(this) == DialogResult.OK) {
-        Content.Problem = (IProblem)typeSelectorDialog.TypeSelector.CreateInstanceOfSelectedType();
-      }
-    }
-    protected void openProblemButton_Click(object sender, EventArgs e) {
-      openFileDialog.Title = "Open Problem";
-      if (openFileDialog.ShowDialog(this) == DialogResult.OK) {
-        IProblem problem = null;
-        try {
-          problem = XmlParser.Deserialize(openFileDialog.FileName) as IProblem;
-        }
-        catch (Exception ex) {
-          Auxiliary.ShowErrorMessageBox(ex);
-        }
-        if (problem == null)
-          MessageBox.Show(this, "Selected file does not contain a problem.", "Invalid File", MessageBoxButtons.OK, MessageBoxIcon.Error);
-        else
-          Content.Problem = problem;
-      }
-    }
-    protected void saveProblemButton_Click(object sender, EventArgs e) {
-      saveFileDialog.Title = "Save Problem";
-      if (saveFileDialog.ShowDialog(this) == DialogResult.OK) {
-        try {
-          if (saveFileDialog.FilterIndex == 1)
-            XmlGenerator.Serialize(Content.Problem, saveFileDialog.FileName, 0);
-          else
-            XmlGenerator.Serialize(Content.Problem, saveFileDialog.FileName, 9);
-        }
-        catch (Exception ex) {
-          Auxiliary.ShowErrorMessageBox(ex);
-        }
-      }
-    }
     protected virtual void startButton_Click(object sender, EventArgs e) {
       Content.Start();

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

@@ -131 +131 @@
       <DependentUpon>OperatorTreeView.cs</DependentUpon>
     </Compile>
-    <Compile Include="ProblemView.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
-    <Compile Include="ProblemView.Designer.cs">
-      <DependentUpon>ProblemView.cs</DependentUpon>
-    </Compile>
     <Compile Include="TypeSelectorDialog.cs">
       <SubType>Form</SubType>

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

@@ -71 +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>
@@ -105 +88 @@
     /// </summary>
     [Storable]
-    private Stack<IExecutionSequence> executionStack;
+    private Stack<IOperation> executionStack;
     /// <summary>
     /// Gets the current execution stack.
     /// </summary>
-    protected Stack<IExecutionSequence> ExecutionStack {
+    protected Stack<IOperation> ExecutionStack {
       get { return executionStack; }
     }
@@ -146 +129 @@
     protected Engine() {
       globalScope = new Scope("Global");
-      problem = null;
-      executionStack = new Stack<IExecutionSequence>();
+      executionStack = new Stack<IOperation>();
       OperatorGraph = new OperatorGraph();
     }
@@ -162 +144 @@
       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();
+      IOperation[] contexts = executionStack.ToArray();
       for (int i = contexts.Length - 1; i >= 0; i--)
-        clone.executionStack.Push((IExecutionSequence)cloner.Clone(contexts[i]));
+        clone.executionStack.Push((IOperation)cloner.Clone(contexts[i]));
       clone.running = running;
       clone.canceled = canceled;
@@ -172 +153 @@
     }
 
+    public void Prepare(IOperation initialOperation) {
+      canceled = false;
+      running = false;
+      globalScope.Clear();
+      ExecutionTime = new TimeSpan();
+      executionStack.Clear();
+      if (initialOperation != null)
+        executionStack.Push(initialOperation);
+      OnPrepared();
+    }
     /// <inheritdoc/>
     /// <remarks>Sets <c>myCanceled</c> and <c>myRunning</c> to <c>false</c>. The global scope is cleared,
@@ -178 +169 @@
     /// Calls <see cref="OnPrepared"/>.</remarks>
     public void Prepare() {
-      canceled = false;
-      running = false;
-      globalScope.Clear();
-      ExecutionTime = new TimeSpan();
-      executionStack.Clear();
-      if ((OperatorGraph.InitialOperator != null) && (Problem != null))
-        executionStack.Push(new ExecutionContext(null, OperatorGraph.InitialOperator, GlobalScope, Problem));
-      OnPrepared();
+      if (OperatorGraph.InitialOperator != null)
+        Prepare(new ExecutionContext(null, OperatorGraph.InitialOperator, GlobalScope));
     }
     /// <inheritdoc/>
@@ -254 +239 @@
     }
     /// <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>
     /// Occurs when the execution time changed.
     /// </summary>

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

@@ -21 +21 @@
 
 using System;
-using System.Collections.Generic;
-using System.Text;
+using HeuristicLab.Collections;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 
 namespace HeuristicLab.Core {
-  public class ExecutionContext : DeepCloneable, IExecutionSequence {
+  public class ExecutionContext : DeepCloneable, IExecutionContext, IAtomicOperation {
     [Storable]
-    private ExecutionContext parent;
-    public ExecutionContext Parent {
+    private IParameterizedItem parameterizedItem;
+
+    [Storable]
+    private IExecutionContext parent;
+    public IExecutionContext Parent {
       get { return parent; }
     }
 
-    [Storable]
-    private IOperator op;
+    public IObservableKeyedCollection<string, IParameter> Parameters {
+      get { return parameterizedItem.Parameters; }
+    }
+
     public IOperator Operator {
-      get { return op; }
+      get { return parameterizedItem as IOperator; }
     }
 
@@ -45 +49 @@
     }
 
-    [Storable]
-    private IProblem problem;
-    public IProblem Problem {
-      get { return problem; }
-    }
-
     private ExecutionContext() {
       parent = null;
-      op = null;
+      parameterizedItem = null;
       scope = null;
-      problem = null;
     }
-    public ExecutionContext(ExecutionContext parent, IOperator op, IScope scope, IProblem problem) {
-      if ((op == null) || (scope == null) || (problem == null)) throw new ArgumentNullException();
+    public ExecutionContext(IExecutionContext parent, IParameterizedItem parameterizedItem, IScope scope) {
+      if ((parameterizedItem == null) || (scope == null)) throw new ArgumentNullException();
       this.parent = parent;
-      this.op = op;
+      this.parameterizedItem = parameterizedItem;
       this.scope = scope;
-      this.problem = problem;
     }
 
@@ -68 +64 @@
       ExecutionContext clone = new ExecutionContext();
       cloner.RegisterClonedObject(this, clone);
-      clone.parent = (ExecutionContext)cloner.Clone(parent);
-      clone.op = (IOperator)cloner.Clone(op);
+      clone.parent = (IExecutionContext)cloner.Clone(parent);
+      clone.parameterizedItem = (IParameterizedItem)cloner.Clone(parameterizedItem);
       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 IAtomicOperation CreateOperation(IOperator op) {
+      return new ExecutionContext(parent, op, scope);
     }
-    public ExecutionContext CreateContext(IOperator op, IScope scope) {
-      return new ExecutionContext(parent, op, scope, problem);
+    public IAtomicOperation CreateOperation(IOperator op, IScope scope) {
+      return new ExecutionContext(parent, op, scope);
     }
-    public ExecutionContext CreateChildContext(IOperator op) {
-      return new ExecutionContext(this, op, scope, problem);
+    public IAtomicOperation CreateChildOperation(IOperator op) {
+      return new ExecutionContext(this, op, scope);
     }
-    public ExecutionContext CreateChildContext(IOperator op, IScope scope) {
-      return new ExecutionContext(this, op, scope, problem);
+    public IAtomicOperation CreateChildOperation(IOperator op, IScope scope) {
+      return new ExecutionContext(this, op, scope);
     }
   }

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

@@ -104 +104 @@
     <Compile Include="ChangedEventArgs.cs" />
     <None Include="HeuristicLabCorePlugin.cs.frame" />
+    <Compile Include="Interfaces\IParameterizedItem.cs" />
+    <Compile Include="Interfaces\IAtomicOperation.cs" />
+    <Compile Include="Interfaces\IExecutionContext.cs" />
+    <Compile Include="Interfaces\IOperation.cs" />
+    <Compile Include="OperationCollection.cs" />
     <Compile Include="ValueParameterCollection.cs" />
-    <Compile Include="Interfaces\IProblem.cs" />
-    <Compile Include="Interfaces\IExecutionSequence.cs" />
     <Compile Include="Interfaces\IValueLookupParameter.cs" />
     <Compile Include="Interfaces\IValueParameter.cs" />
@@ -117 +120 @@
     <Compile Include="Item.cs" />
     <Compile Include="NamedItem.cs" />
-    <Compile Include="Problem.cs" />
     <Compile Include="OperatorGraph.cs" />
     <Compile Include="Interfaces\IParameter.cs" />
@@ -128 +130 @@
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="ExecutionContextCollection.cs" />
     <Compile Include="ExecutionContext.cs" />
     <Compile Include="OperatorList.cs" />

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

@@ -38 +38 @@
     /// </summary>
     IScope GlobalScope { get; }
-    /// <summary>
-    /// Gets the problem of the current instance.
-    /// </summary>
-    IProblem Problem { get; set; }
 
     /// <summary>
@@ -62 +58 @@
     void Prepare();
     /// <summary>
+    /// Prepares the engine with a given initial operation.
+    /// </summary>
+    void Prepare(IOperation initialOperation);
+    /// <summary>
     /// Executes the whole run.
     /// </summary>
@@ -78 +78 @@
     /// </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/IOperation.cs

@@ -20 +20 @@
 #endregion
 
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Text;
-using System.Drawing;
-
 namespace HeuristicLab.Core {
   /// <summary>
-  /// Interface which represents an execution context.
+  /// Interface which represents an operation.
   /// </summary>
-  public interface IExecutionSequence : IDeepCloneable { }
+  public interface IOperation : IDeepCloneable { }
 }

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

@@ -21 +21 @@
 
 using System;
-using System.Collections.Generic;
-using System.Text;
-using HeuristicLab.Common;
-using HeuristicLab.Collections;
 
 namespace HeuristicLab.Core {
@@ -31 +27 @@
   /// a basic instruction of an algorithm.
   /// </summary>
-  public interface IOperator : INamedItem {
-    IObservableKeyedCollection<string, IParameter> Parameters { get; }
-
+  public interface IOperator : INamedItem, IParameterizedItem {
     /// <summary>
     /// Gets or sets a boolean value whether the engine should stop here during the run.
@@ -44 +38 @@
     /// <param name="scope">The scope where to execute the current instance.</param>
     /// <returns>The next operation.</returns>
-    IExecutionSequence Execute(ExecutionContext context);
+    IOperation Execute(IExecutionContext context);
     /// <summary>
     /// Aborts the current operator.

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

@@ -21 +21 @@
 
 using System;
-using System.Collections.Generic;
-using System.Text;
-using System.Xml;
-using HeuristicLab.Common;
 
 namespace HeuristicLab.Core {
@@ -30 +26 @@
     Type DataType { get; }
     IItem ActualValue { get; set; }
-    ExecutionContext ExecutionContext { get; set; }
+    IExecutionContext ExecutionContext { get; set; }
   }
 }

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

@@ -21 +21 @@
 
 using System;
-using System.Linq;
 using System.Collections.Generic;
 using System.Drawing;
+using System.Linq;
 using HeuristicLab.Collections;
 using HeuristicLab.Common;

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

@@ -20 +20 @@
 #endregion
 
-using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
-using System.Xml;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 
 namespace HeuristicLab.Core {
-  public class ExecutionContextCollection : DeepCloneable, IList<IExecutionSequence>, IExecutionSequence {
+  public class OperationCollection : DeepCloneable, IList<IOperation>, IOperation {
     [Storable]
-    private IList<IExecutionSequence> contexts;
+    private IList<IOperation> operations;
 
     [Storable]
@@ -39 +36 @@
     }
 
-    public ExecutionContextCollection() {
-      contexts = new List<IExecutionSequence>();
+    public OperationCollection() {
+      operations = new List<IOperation>();
       parallel = false;
     }
-    public ExecutionContextCollection(IEnumerable<IExecutionSequence> collection) {
-      contexts = new List<IExecutionSequence>(collection.Where(e => e != null));
+    public OperationCollection(IEnumerable<IOperation> collection) {
+      operations = new List<IOperation>(collection.Where(e => e != null));
       parallel = false;
     }
-    public ExecutionContextCollection(params IExecutionSequence[] list) {
-      contexts = new List<IExecutionSequence>(list.Where(e => e != null));
+    public OperationCollection(params IOperation[] list) {
+      operations = new List<IOperation>(list.Where(e => e != null));
       parallel = false;
     }
 
     public override IDeepCloneable Clone(Cloner cloner) {
-      ExecutionContextCollection clone = new ExecutionContextCollection();
+      OperationCollection clone = new OperationCollection(this.Select(x => (IOperation)cloner.Clone(x)));
       cloner.RegisterClonedObject(this, clone);
       clone.parallel = parallel;
-      for (int i = 0; i < contexts.Count; i++)
-        clone.contexts.Add((IExecutionSequence)cloner.Clone(contexts[i]));
       return clone;
     }
 
-    #region IList<IExecutionContext> Members
-    public int IndexOf(IExecutionSequence item) {
-      return contexts.IndexOf(item);
+    #region IList<IOperation> Members
+    public int IndexOf(IOperation item) {
+      return operations.IndexOf(item);
     }
-    public void Insert(int index, IExecutionSequence item) {
-      if (item != null) contexts.Insert(index, item);
+    public void Insert(int index, IOperation item) {
+      if (item != null) operations.Insert(index, item);
     }
     public void RemoveAt(int index) {
-      contexts.RemoveAt(index);
+      operations.RemoveAt(index);
     }
-    public IExecutionSequence this[int index] {
-      get { return contexts[index]; }
-      set { if (value != null) contexts[index] = value; }
+    public IOperation this[int index] {
+      get { return operations[index]; }
+      set { if (value != null) operations[index] = value; }
     }
     #endregion
 
-    #region ICollection<IExecutionContext> Members
-    public void Add(IExecutionSequence item) {
-      if (item != null) contexts.Add(item);
+    #region ICollection<IOperation> Members
+    public void Add(IOperation item) {
+      if (item != null) operations.Add(item);
     }
     public void Clear() {
-      contexts.Clear();
+      operations.Clear();
     }
-    public bool Contains(IExecutionSequence item) {
-      return contexts.Contains(item);
+    public bool Contains(IOperation item) {
+      return operations.Contains(item);
     }
-    public void CopyTo(IExecutionSequence[] array, int arrayIndex) {
-      contexts.CopyTo(array, arrayIndex);
+    public void CopyTo(IOperation[] array, int arrayIndex) {
+      operations.CopyTo(array, arrayIndex);
     }
     public int Count {
-      get { return contexts.Count; }
+      get { return operations.Count; }
     }
     public bool IsReadOnly {
-      get { return contexts.IsReadOnly; }
+      get { return operations.IsReadOnly; }
     }
-    public bool Remove(IExecutionSequence item) {
-      return contexts.Remove(item);
+    public bool Remove(IOperation item) {
+      return operations.Remove(item);
     }
     #endregion
 
-    #region IEnumerable<IExecutionContext> Members
-    public IEnumerator<IExecutionSequence> GetEnumerator() {
-      return contexts.GetEnumerator();
+    #region IEnumerable<IOperation> Members
+    public IEnumerator<IOperation> GetEnumerator() {
+      return operations.GetEnumerator();
     }
     #endregion
@@ -109 +104 @@
     #region IEnumerable Members
     System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator() {
-      return contexts.GetEnumerator();
+      return operations.GetEnumerator();
     }
     #endregion

trunk/sources/HeuristicLab.Evolutionary/3.3/ChildrenCreator.cs

@@ -60 +60 @@
     }
 
-    public override IExecutionSequence Apply() {
+    public override IOperation Apply() {
       int parentsPerChild = ParentsPerChildParameter.ActualValue.Value;
       int parents = CurrentScope.SubScopes.Count;

trunk/sources/HeuristicLab.Evolutionary/3.3/PopulationCreator.cs

@@ -59 +59 @@
     }
 
-    public override IExecutionSequence Apply() {
+    public override IOperation Apply() {
       int size = PopulationSizeParameter.ActualValue.Value;
       IOperator creator = SolutionCreatorParameter.ActualValue;
@@ -69 +69 @@
         CurrentScope.SubScopes.Add(new Scope(i.ToString()));
 
-      ExecutionContextCollection next = new ExecutionContextCollection();
+      OperationCollection next = new OperationCollection();
       for (int i = 0; i < CurrentScope.SubScopes.Count; i++) {
-        if (creator != null) next.Add(ExecutionContext.CreateContext(creator, CurrentScope.SubScopes[i]));
-        if (evaluator != null) next.Add(ExecutionContext.CreateContext(evaluator, CurrentScope.SubScopes[i]));
+        if (creator != null) next.Add(ExecutionContext.CreateOperation(creator, CurrentScope.SubScopes[i]));
+        if (evaluator != null) next.Add(ExecutionContext.CreateOperation(evaluator, CurrentScope.SubScopes[i]));
       }
       next.Add(base.Apply());

trunk/sources/HeuristicLab.Operators.Views/3.3/AlgorithmOperatorView.cs

@@ -28 +28 @@
   /// The base class for visual representations of items.
   /// </summary>
-  [Content(typeof(CombinedOperator), true)]
+  [Content(typeof(AlgorithmOperator), true)]
   public partial class AlgorithmOperatorView : NamedItemView {
     public new AlgorithmOperator Content {

trunk/sources/HeuristicLab.Operators/3.3/AlgorithmOperator.cs

@@ -50 +50 @@
     }
 
-    public override IExecutionSequence Apply() {
-      ExecutionContextCollection next = new ExecutionContextCollection(base.Apply());
+    public override IOperation Apply() {
+      OperationCollection next = new OperationCollection(base.Apply());
       if (operatorGraph.InitialOperator != null)
-        next.Insert(0, ExecutionContext.CreateChildContext(operatorGraph.InitialOperator));
+        next.Insert(0, ExecutionContext.CreateChildOperation(operatorGraph.InitialOperator));
       return next;
     }

trunk/sources/HeuristicLab.Operators/3.3/Assigner.cs

@@ -45 +45 @@
     }
 
-    public override IExecutionSequence Apply() {
+    public override IOperation Apply() {
       LeftSideParameter.ActualValue = (IItem)RightSideParameter.ActualValue.Clone();
       return base.Apply();

trunk/sources/HeuristicLab.Operators/3.3/CombinedOperator.cs

@@ -20 +20 @@
 #endregion
 
-using System.Drawing;
 using HeuristicLab.Collections;
 using HeuristicLab.Core;
-using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 
 namespace HeuristicLab.Operators {
@@ -31 +29 @@
   [Item("CombinedOperator", "An operator which contains an operator graph.")]
   [Creatable("Test")]
-  public sealed class CombinedOperator : AlgorithmOperator, IOperator {
+  public sealed class CombinedOperator : AlgorithmOperator, IParameterizedItem {
     public new ParameterCollection Parameters {
       get {
@@ -37 +35 @@
       }
     }
-    IObservableKeyedCollection<string, IParameter> IOperator.Parameters {
+    IObservableKeyedCollection<string, IParameter> IParameterizedItem.Parameters {
       get { return Parameters; }
     }

trunk/sources/HeuristicLab.Operators/3.3/Comparator.cs

@@ -59 +59 @@
     }
 
-    public override IExecutionSequence Apply() {
+    public override IOperation Apply() {
       IItem left = LeftSideParameter.ActualValue;
       IItem right = RightSideParameter.ActualValue;

trunk/sources/HeuristicLab.Operators/3.3/ConditionalBranch.cs

@@ -58 +58 @@
     }
 
-    public override IExecutionSequence Apply() {
-      ExecutionContextCollection next = new ExecutionContextCollection(base.Apply());
+    public override IOperation Apply() {
+      OperationCollection next = new OperationCollection(base.Apply());
       if (ConditionParameter.ActualValue.Value) {
-        if (TrueBranch != null) next.Insert(0, ExecutionContext.CreateContext(TrueBranch));
+        if (TrueBranch != null) next.Insert(0, ExecutionContext.CreateOperation(TrueBranch));
       } else {
-        if (FalseBranch != null) next.Insert(0, ExecutionContext.CreateContext(FalseBranch));
+        if (FalseBranch != null) next.Insert(0, ExecutionContext.CreateOperation(FalseBranch));
       }
       return next;

trunk/sources/HeuristicLab.Operators/3.3/DoubleCounter.cs

@@ -50 +50 @@
     }
 
-    public override IExecutionSequence Apply() {
+    public override IOperation Apply() {
       if (ValueParameter.ActualValue == null) ValueParameter.ActualValue = new DoubleData();
       ValueParameter.ActualValue.Value += IncrementParameter.ActualValue.Value;

trunk/sources/HeuristicLab.Operators/3.3/IntCounter.cs

@@ -50 +50 @@
     }
 
-    public override IExecutionSequence Apply() {
+    public override IOperation Apply() {
       if (ValueParameter.ActualValue == null) ValueParameter.ActualValue = new IntData();
       ValueParameter.ActualValue.Value += IncrementParameter.ActualValue.Value;

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

@@ -51 +51 @@
     }
     private ReadOnlyObservableKeyedCollection<string, IParameter> readOnlyParameters;
-    IObservableKeyedCollection<string, IParameter> IOperator.Parameters {
+    IObservableKeyedCollection<string, IParameter> IParameterizedItem.Parameters {
       get {
         if (readOnlyParameters == null) readOnlyParameters = parameters.AsReadOnly();
@@ -59 +59 @@
 
     [Storable]
-    private ExecutionContext executionContext;
-    protected ExecutionContext ExecutionContext {
+    private IExecutionContext executionContext;
+    protected IExecutionContext ExecutionContext {
       get { return executionContext; }
       private set {
@@ -122 +122 @@
       clone.canceled = canceled;
       clone.breakpoint = breakpoint;
-      clone.executionContext = (ExecutionContext)cloner.Clone(executionContext);
+      clone.executionContext = (IExecutionContext)cloner.Clone(executionContext);
       return clone;
     }
 
     /// <inheritdoc/>
-    public virtual IExecutionSequence Execute(ExecutionContext context) {
+    public virtual IOperation Execute(IExecutionContext context) {
       try {
         Canceled = false;
@@ -133 +133 @@
         foreach (IParameter param in Parameters)
           param.ExecutionContext = context;
-        IExecutionSequence next = Apply();
+        IOperation next = Apply();
         OnExecuted();
         return next;
@@ -153 +153 @@
     /// <param name="scope">The scope where to execute the operator</param>
     /// <returns><c>null</c>.</returns>
-    public abstract IExecutionSequence Apply();
+    public abstract IOperation Apply();
 
     protected virtual void OnExecutionContextChanged() { }

trunk/sources/HeuristicLab.Operators/3.3/ParallelSubScopesProcessor.cs

@@ -33 +33 @@
     }
 
-    public override IExecutionSequence Apply() {
-      ExecutionContextCollection next = new ExecutionContextCollection(base.Apply());
+    public override IOperation Apply() {
+      OperationCollection next = new OperationCollection(base.Apply());
       if (Operators.Count > 0) {
-        ExecutionContextCollection inner = new ExecutionContextCollection();
+        OperationCollection inner = new OperationCollection();
         inner.Parallel = true;
         for (int i = 0; (i < ExecutionContext.Scope.SubScopes.Count) && (i < Operators.Count); i++)
-          if (Operators[i] != null) inner.Add(ExecutionContext.CreateContext(Operators[i], ExecutionContext.Scope.SubScopes[i]));
+          if (Operators[i] != null) inner.Add(ExecutionContext.CreateOperation(Operators[i], ExecutionContext.Scope.SubScopes[i]));
         next.Insert(0, inner);
       }

trunk/sources/HeuristicLab.Operators/3.3/Placeholder.cs

@@ -41 +41 @@
     }
 
-    public override IExecutionSequence Apply() {
-      ExecutionContextCollection next = new ExecutionContextCollection(base.Apply());
+    public override IOperation Apply() {
+      OperationCollection next = new OperationCollection(base.Apply());
       IOperator op = OperatorParameter.ActualValue;
       if (op != null)
-        next.Insert(0, ExecutionContext.CreateContext(op));
+        next.Insert(0, ExecutionContext.CreateOperation(op));
       return next;
     }

trunk/sources/HeuristicLab.Operators/3.3/ScopeCleaner.cs

@@ -44 +44 @@
     }
 
-    public override IExecutionSequence Apply() {
+    public override IOperation Apply() {
       CurrentScope.Variables.Clear();
       CurrentScope.SubScopes.Clear();

trunk/sources/HeuristicLab.Operators/3.3/SequentialSubScopesProcessor.cs

@@ -33 +33 @@
     }
 
-    public override IExecutionSequence Apply() {
-      ExecutionContextCollection next = new ExecutionContextCollection(base.Apply());
+    public override IOperation Apply() {
+      OperationCollection next = new OperationCollection(base.Apply());
       if (Operators.Count > 0) {
-        ExecutionContextCollection inner = new ExecutionContextCollection();
+        OperationCollection inner = new OperationCollection();
         for (int i = 0; (i < ExecutionContext.Scope.SubScopes.Count) && (i < Operators.Count); i++)
-          if (Operators[i] != null) inner.Add(ExecutionContext.CreateContext(Operators[i], ExecutionContext.Scope.SubScopes[i]));
+          if (Operators[i] != null) inner.Add(ExecutionContext.CreateOperation(Operators[i], ExecutionContext.Scope.SubScopes[i]));
         next.Insert(0, inner);
       }

trunk/sources/HeuristicLab.Operators/3.3/SingleSuccessorOperator.cs

@@ -45 +45 @@
     }
 
-    public override IExecutionSequence Apply() {
+    public override IOperation Apply() {
       if (Successor != null)
-        return ExecutionContext.CreateContext(Successor);
+        return ExecutionContext.CreateOperation(Successor);
       else
         return null;

trunk/sources/HeuristicLab.Operators/3.3/StochasticBranch.cs

@@ -62 +62 @@
     }
 
-    public override IExecutionSequence Apply() {
-      ExecutionContextCollection next = new ExecutionContextCollection(base.Apply());
+    public override IOperation Apply() {
+      OperationCollection next = new OperationCollection(base.Apply());
       if (RandomParameter.ActualValue.NextDouble() < ProbabilityParameter.ActualValue.Value) {
-        if (FirstBranch != null) next.Insert(0, ExecutionContext.CreateContext(FirstBranch));
+        if (FirstBranch != null) next.Insert(0, ExecutionContext.CreateOperation(FirstBranch));
       } else {
-        if (SecondBranch != null) next.Insert(0, ExecutionContext.CreateContext(SecondBranch));
+        if (SecondBranch != null) next.Insert(0, ExecutionContext.CreateOperation(SecondBranch));
       }
       return next;

trunk/sources/HeuristicLab.Operators/3.3/SubScopesCreator.cs

@@ -49 +49 @@
     }
 
-    public override IExecutionSequence Apply() {
+    public override IOperation Apply() {
       int n = NumberOfSubScopesParameter.ActualValue.Value;
       for (int i = 0; i < n; i++)

trunk/sources/HeuristicLab.Operators/3.3/SubScopesRemover.cs

@@ -58 +58 @@
     }
 
-    public override IExecutionSequence Apply() {
+    public override IOperation Apply() {
       if (RemoveAllSubScopes)
         CurrentScope.SubScopes.Clear();

trunk/sources/HeuristicLab.Operators/3.3/SubScopesSorter.cs

@@ -56 +56 @@
     }
 
-    public override IExecutionSequence Apply() {
+    public override IOperation Apply() {
       descending = DescendingParameter.ActualValue.Value;
       actualName = LookupParameter<ItemArray<DoubleData>>.TranslateName(ValueParameter.Name, ExecutionContext);

trunk/sources/HeuristicLab.Operators/3.3/UniformParallelSubScopesProcessor.cs

@@ -45 +45 @@
     }
 
-    public override IExecutionSequence Apply() {
-      ExecutionContextCollection next = new ExecutionContextCollection(base.Apply());
+    public override IOperation Apply() {
+      OperationCollection next = new OperationCollection(base.Apply());
       if (Operator != null) {
-        ExecutionContextCollection inner = new ExecutionContextCollection();
+        OperationCollection inner = new OperationCollection();
         inner.Parallel = true;
         for (int i = 0; i < ExecutionContext.Scope.SubScopes.Count; i++)
-          inner.Add(ExecutionContext.CreateContext(Operator, ExecutionContext.Scope.SubScopes[i]));
+          inner.Add(ExecutionContext.CreateOperation(Operator, ExecutionContext.Scope.SubScopes[i]));
         next.Insert(0, inner);
       }

trunk/sources/HeuristicLab.Operators/3.3/UniformSequentialSubScopesProcessor.cs

@@ -45 +45 @@
     }
 
-    public override IExecutionSequence Apply() {
-      ExecutionContextCollection next = new ExecutionContextCollection(base.Apply());
+    public override IOperation Apply() {
+      OperationCollection next = new OperationCollection(base.Apply());
       if (Operator != null) {
-        ExecutionContextCollection inner = new ExecutionContextCollection();
+        OperationCollection inner = new OperationCollection();
         for (int i = 0; i < ExecutionContext.Scope.SubScopes.Count; i++)
-          inner.Add(ExecutionContext.CreateContext(Operator, ExecutionContext.Scope.SubScopes[i]));
+          inner.Add(ExecutionContext.CreateOperation(Operator, ExecutionContext.Scope.SubScopes[i]));
         next.Insert(0, inner);
       }

trunk/sources/HeuristicLab.Operators/3.3/VariableCreator.cs

@@ -44 +44 @@
     }
 
-    public override IExecutionSequence Apply() {
+    public override IOperation Apply() {
       IVariable var;
       foreach (IParameter param in CollectedValues) {

trunk/sources/HeuristicLab.Optimization.Views/3.3/ProblemView.Designer.cs

@@ -20 +20 @@
 #endregion
 
-namespace HeuristicLab.Core.Views {
+namespace HeuristicLab.Optimization.Views {
   partial class ProblemView {
     /// <summary> 
@@ -45 +45 @@
     /// </summary>
     private void InitializeComponent() {
-      this.valueParameterCollectionView = new HeuristicLab.Core.Views.ValueParameterCollectionView();
+      this.parameterCollectionView = new HeuristicLab.Core.Views.ParameterCollectionView();
       ((System.ComponentModel.ISupportInitialize)(this.errorProvider)).BeginInit();
       this.SuspendLayout();
@@ -61 +61 @@
       this.descriptionTextBox.Size = new System.Drawing.Size(418, 87);
       // 
-      // valueParameterCollectionView
+      // parameterCollectionView
       // 
-      this.valueParameterCollectionView.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
+      this.parameterCollectionView.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
                   | System.Windows.Forms.AnchorStyles.Left)
                   | System.Windows.Forms.AnchorStyles.Right)));
-      this.valueParameterCollectionView.Caption = "ValueParameterCollection";
-      this.valueParameterCollectionView.Content = null;
-      this.valueParameterCollectionView.Location = new System.Drawing.Point(0, 119);
-      this.valueParameterCollectionView.Name = "valueParameterCollectionView";
-      this.valueParameterCollectionView.Size = new System.Drawing.Size(490, 234);
-      this.valueParameterCollectionView.TabIndex = 4;
+      this.parameterCollectionView.Caption = "ParameterCollection";
+      this.parameterCollectionView.Content = null;
+      this.parameterCollectionView.Location = new System.Drawing.Point(0, 119);
+      this.parameterCollectionView.Name = "parameterCollectionView";
+      this.parameterCollectionView.Size = new System.Drawing.Size(490, 234);
+      this.parameterCollectionView.TabIndex = 4;
       // 
       // ProblemView
@@ -77 +77 @@
       this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
       this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-      this.Controls.Add(this.valueParameterCollectionView);
+      this.Controls.Add(this.parameterCollectionView);
       this.Name = "ProblemView";
       this.Size = new System.Drawing.Size(490, 353);
-      this.Controls.SetChildIndex(this.valueParameterCollectionView, 0);
+      this.Controls.SetChildIndex(this.parameterCollectionView, 0);
       this.Controls.SetChildIndex(this.nameLabel, 0);
       this.Controls.SetChildIndex(this.descriptionLabel, 0);
@@ -93 +93 @@
     #endregion
 
-    protected ValueParameterCollectionView valueParameterCollectionView;
+    protected HeuristicLab.Core.Views.ParameterCollectionView parameterCollectionView;
 
   }

trunk/sources/HeuristicLab.Optimization.Views/3.3/ProblemView.cs

@@ -20 +20 @@
 #endregion
 
+using HeuristicLab.Core.Views;
 using HeuristicLab.MainForm;
 
-namespace HeuristicLab.Core.Views { 
+namespace HeuristicLab.Optimization.Views { 
   /// <summary>
   /// The base class for visual representations of items.
@@ -52 +53 @@
       base.OnContentChanged();
       if (Content == null)
-        valueParameterCollectionView.Content = null;
+        parameterCollectionView.Content = null;
       else
-        valueParameterCollectionView.Content = ((IProblem)Content).Parameters;
+        parameterCollectionView.Content = ((IProblem)Content).Parameters;
     }
   }

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

@@ -20 +20 @@
 #endregion
 
-using HeuristicLab.Collections;
+using HeuristicLab.Core;
 
-namespace HeuristicLab.Core {
+namespace HeuristicLab.Optimization {
   /// <summary>
   /// Interface to represent a problem.
   /// </summary>
-  public interface IProblem : INamedItem {
-    IObservableKeyedCollection<string, IValueParameter> Parameters { get; }
-  }
+  public interface IProblem : INamedItem, IParameterizedItem { }
 }

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

@@ -25 +25 @@
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 
-namespace HeuristicLab.Core {
+namespace HeuristicLab.Optimization {
   /// <summary>
   /// The base class for all problems.
@@ -35 +35 @@
     }
 
-    private ValueParameterCollection parameters;
+    private ParameterCollection parameters;
     [Storable]
-    protected ValueParameterCollection Parameters {
+    protected ParameterCollection Parameters {
       get { return parameters;}
       private set {
@@ -46 +46 @@
       }
     }
-    private ReadOnlyObservableKeyedCollection<string, IValueParameter> readOnlyParameters;
-    IObservableKeyedCollection<string, IValueParameter> IProblem.Parameters {
+    private ReadOnlyObservableKeyedCollection<string, IParameter> readOnlyParameters;
+    IObservableKeyedCollection<string, IParameter> IParameterizedItem.Parameters {
       get {
         if (readOnlyParameters == null) readOnlyParameters = parameters.AsReadOnly();
@@ -56 +56 @@
     protected Problem() {
       Name = ItemName;
-      Parameters = new ValueParameterCollection();
+      Parameters = new ParameterCollection();
       readOnlyParameters = null;
     }
@@ -62 +62 @@
     public override IDeepCloneable Clone(Cloner cloner) {
       Problem clone = (Problem)base.Clone(cloner);
-      clone.Parameters = (ValueParameterCollection)cloner.Clone(parameters);
+      clone.Parameters = (ParameterCollection)cloner.Clone(parameters);
       return clone;
     }

trunk/sources/HeuristicLab.Parameters/3.3/LookupParameter.cs

@@ -74 +74 @@
       IValueParameter valueParam = this as IValueParameter;
       ILookupParameter lookupParam = this as ILookupParameter;
-      ExecutionContext current = ExecutionContext;
+      IExecutionContext current = ExecutionContext;
 
       name = Name;
@@ -82 +82 @@
 
         current = current.Parent;
-        while ((current != null) && !current.Operator.Parameters.ContainsKey(name))
+        while ((current != null) && !current.Parameters.ContainsKey(name))
           current = current.Parent;
 
         if (current != null) {
-          valueParam = current.Operator.Parameters[name] as IValueParameter;
-          lookupParam = current.Operator.Parameters[name] as ILookupParameter;
+          valueParam = current.Parameters[name] as IValueParameter;
+          lookupParam = current.Parameters[name] as ILookupParameter;
           if ((valueParam == null) && (lookupParam == null))
             throw new InvalidOperationException(
@@ -108 +108 @@
       return scope != null ? scope.Variables[actualName] : null;
     }
-    private IValueParameter GetProblemParameter(string name) {
-      IValueParameter param = null;
-      if (ExecutionContext.Problem.Parameters.ContainsKey(name)) {
-        param = ExecutionContext.Problem.Parameters[name] as IValueParameter;
-        if (param == null)
-          throw new InvalidOperationException(
-            string.Format("Parameter look-up chain broken. Parameter \"{0}\" is not an \"{1}\".",
-                          name,
-                          typeof(IValueParameter).GetPrettyName())
-          );
-      }
-      return param;
-    }
+    //private IValueParameter GetProblemParameter(string name) {
+    //  IValueParameter param = null;
+    //  if (ExecutionContext.Problem.Parameters.ContainsKey(name)) {
+    //    param = ExecutionContext.Problem.Parameters[name] as IValueParameter;
+    //    if (param == null)
+    //      throw new InvalidOperationException(
+    //        string.Format("Parameter look-up chain broken. Parameter \"{0}\" is not an \"{1}\".",
+    //                      name,
+    //                      typeof(IValueParameter).GetPrettyName())
+    //      );
+    //  }
+    //  return param;
+    //}
     protected override IItem GetActualValue() {
       string name;
@@ -141 +141 @@
 
       // try to get value from problem
-      IValueParameter problemParam = GetProblemParameter(name);
-      if (problemParam != null) return problemParam.Value;
+      //IValueParameter problemParam = GetProblemParameter(name);
+      //if (problemParam != null) return problemParam.Value;
 
       return null;
@@ -169 +169 @@
 
       // try to set value in problem
-      IValueParameter problemParam = GetProblemParameter(name);
-      if (problemParam != null) {
-        problemParam.Value = val;
-        return;
-      }
+      //IValueParameter problemParam = GetProblemParameter(name);
+      //if (problemParam != null) {
+      //  problemParam.Value = val;
+      //  return;
+      //}
 
       // create new variable
@@ -186 +186 @@
     }
 
-    public static string TranslateName(string name, ExecutionContext context) {
+    public static string TranslateName(string name, IExecutionContext context) {
       string currentName = name;
-      ExecutionContext currentContext = context;
+      IExecutionContext currentContext = context;
       IParameter param;
       ILookupParameter lookupParam;
 
       while (currentContext != null) {
-        currentContext.Operator.Parameters.TryGetValue(currentName, out param);
+        currentContext.Parameters.TryGetValue(currentName, out param);
         if (param != null) {
           lookupParam = param as ILookupParameter;

trunk/sources/HeuristicLab.Parameters/3.3/Parameter.cs

@@ -48 +48 @@
     }
     [Storable]
-    private ExecutionContext executionContext;
-    public ExecutionContext ExecutionContext {
+    private IExecutionContext executionContext;
+    public IExecutionContext ExecutionContext {
       get { return executionContext; }
       set {
@@ -77 +77 @@
       Parameter clone = (Parameter)base.Clone(cloner);
       clone.dataType = dataType;
-      clone.executionContext = (ExecutionContext)cloner.Clone(executionContext);
+      clone.executionContext = (IExecutionContext)cloner.Clone(executionContext);
       return clone;
     }

trunk/sources/HeuristicLab.Permutation/3.3/PermutationCrossover.cs

@@ -49 +49 @@
     }
 
-    public sealed override IExecutionSequence Apply() {
+    public sealed override IOperation Apply() {
       ChildParameter.ActualValue = Cross(RandomParameter.ActualValue, ParentsParameter.ActualValue);
       return base.Apply();

trunk/sources/HeuristicLab.Permutation/3.3/PermutationManipulator.cs

@@ -45 +45 @@
     }
 
-    public sealed override IExecutionSequence Apply() {
+    public sealed override IOperation Apply() {
       Manipulate(RandomParameter.ActualValue, PermutationParameter.ActualValue);
       return base.Apply();

trunk/sources/HeuristicLab.Permutation/3.3/RandomPermutationCreator.cs

@@ -51 +51 @@
     }
 
-    public override IExecutionSequence Apply() {
+    public override IOperation Apply() {
       PermutationParameter.ActualValue = new Permutation(LengthParameter.ActualValue.Value, RandomParameter.ActualValue);
       return base.Apply();

trunk/sources/HeuristicLab.Random/3.3/RandomCreator.cs

@@ -59 +59 @@
     }
 
-    public override IExecutionSequence Apply() {
+    public override IOperation Apply() {
       if (SetSeedRandomlyParameter.ActualValue == null) SetSeedRandomlyParameter.ActualValue = new BoolData(true);
       bool setSeedRandomly = SetSeedRandomlyParameter.ActualValue.Value;

trunk/sources/HeuristicLab.Routing.TSP.Views/3.3/HeuristicLab.Routing.TSP.Views-3.3.csproj

@@ -86 +86 @@
       <Name>HeuristicLab.MainForm-3.2</Name>
     </ProjectReference>
+    <ProjectReference Include="..\..\HeuristicLab.Optimization.Views\3.3\HeuristicLab.Optimization.Views-3.3.csproj">
+      <Project>{662B4B15-8F4D-4AE5-B3EB-D91C215F5AF2}</Project>
+      <Name>HeuristicLab.Optimization.Views-3.3</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\HeuristicLab.Optimization\3.3\HeuristicLab.Optimization-3.3.csproj">
+      <Project>{14AB8D24-25BC-400C-A846-4627AA945192}</Project>
+      <Name>HeuristicLab.Optimization-3.3</Name>
+    </ProjectReference>
     <ProjectReference Include="..\..\HeuristicLab.PluginInfrastructure\HeuristicLab.PluginInfrastructure.csproj">
       <Project>{94186A6A-5176-4402-AE83-886557B53CCA}</Project>

trunk/sources/HeuristicLab.Routing.TSP.Views/3.3/HeuristicLabRoutingTSPViewsPlugin.cs.frame

@@ -33 +33 @@
   [PluginDependency("HeuristicLab.MainForm", "3.2")]
   [PluginDependency("HeuristicLab.MainForm.WindowsForms", "3.2")]
+  [PluginDependency("HeuristicLab.Optimization", "3.3")]
+  [PluginDependency("HeuristicLab.Optimization.Views", "3.3")]
   [PluginDependency("HeuristicLab.Routing.TSP", "3.3")]
   public class HeuristicLabRoutingTSPViewsPlugin : PluginBase {

trunk/sources/HeuristicLab.Routing.TSP.Views/3.3/TSPView.Designer.cs

@@ -50 +50 @@
       this.SuspendLayout();
       // 
-      // valueParameterCollectionView
+      // parameterCollectionView
       // 
-      this.valueParameterCollectionView.Size = new System.Drawing.Size(490, 205);
+      this.parameterCollectionView.Size = new System.Drawing.Size(490, 205);
       // 
       // nameTextBox
@@ -85 +85 @@
       this.Name = "TSPView";
       this.Controls.SetChildIndex(this.importButton, 0);
-      this.Controls.SetChildIndex(this.valueParameterCollectionView, 0);
+      this.Controls.SetChildIndex(this.parameterCollectionView, 0);
       this.Controls.SetChildIndex(this.nameLabel, 0);
       this.Controls.SetChildIndex(this.descriptionLabel, 0);

trunk/sources/HeuristicLab.Routing.TSP.Views/3.3/TSPView.cs

@@ -24 +24 @@
 using HeuristicLab.Core.Views;
 using HeuristicLab.MainForm;
+using HeuristicLab.Optimization.Views;
 
 namespace HeuristicLab.Routing.TSP.Views {

trunk/sources/HeuristicLab.Routing.TSP/3.3/HeuristicLab.Routing.TSP-3.3.csproj

@@ -109 +109 @@
       <Name>HeuristicLab.Operators-3.3</Name>
     </ProjectReference>
+    <ProjectReference Include="..\..\HeuristicLab.Optimization\3.3\HeuristicLab.Optimization-3.3.csproj">
+      <Project>{14AB8D24-25BC-400C-A846-4627AA945192}</Project>
+      <Name>HeuristicLab.Optimization-3.3</Name>
+    </ProjectReference>
     <ProjectReference Include="..\..\HeuristicLab.Parameters\3.3\HeuristicLab.Parameters-3.3.csproj">
       <Project>{56F9106A-079F-4C61-92F6-86A84C2D84B7}</Project>

trunk/sources/HeuristicLab.Routing.TSP/3.3/HeuristicLabRoutingTSPPlugin.cs.frame

@@ -32 +32 @@
   [PluginDependency("HeuristicLab.Data", "3.3")]
   [PluginDependency("HeuristicLab.Operators", "3.3")]
+  [PluginDependency("HeuristicLab.Optimization", "3.3")]
   [PluginDependency("HeuristicLab.Parameters", "3.3")]
   [PluginDependency("HeuristicLab.Permutation", "3.3")]

trunk/sources/HeuristicLab.Routing.TSP/3.3/TSP.cs

@@ -22 +22 @@
 using HeuristicLab.Core;
 using HeuristicLab.Data;
+using HeuristicLab.Optimization;
 using HeuristicLab.Parameters;
 using HeuristicLab.Permutation;

trunk/sources/HeuristicLab.Routing.TSP/3.3/TSPDistanceMatrixPathEvaluator.cs

@@ -51 +51 @@
     }
 
-    public override IExecutionSequence Apply() {
+    public override IOperation Apply() {
       DoubleMatrixData distanceMatrix = DistanceMatrixParameter.ActualValue;
       Permutation.Permutation permutation = PermutationParameter.ActualValue;

trunk/sources/HeuristicLab.Routing.TSP/3.3/TSPPathEvaluator.cs

@@ -50 +50 @@
     }
 
-    public override IExecutionSequence Apply() {
+    public override IOperation Apply() {
       DoubleMatrixData coordinates = CoordinatesParameter.ActualValue;
       Permutation.Permutation permutation = PermutationParameter.ActualValue;

trunk/sources/HeuristicLab.SGA/3.3/SGAOperator.cs

@@ -193 +193 @@
     }
 
-    public override IExecutionSequence Apply() {
+    public override IOperation Apply() {
       int populationSize = CurrentScope.SubScopes.Count;
       // dynamically set the number of parents which are selected for reproduction

trunk/sources/HeuristicLab.Selection/3.3/Reducer.cs

@@ -46 +46 @@
     }
 
-    public sealed override IExecutionSequence Apply() {
+    public sealed override IOperation Apply() {
       List<IScope> scopes = new List<IScope>(CurrentScope.SubScopes);
       List<IScope> reduced = Reduce(scopes);

trunk/sources/HeuristicLab.Selection/3.3/Selector.cs

@@ -59 +59 @@
     }
 
-    public sealed override IExecutionSequence Apply() {
+    public sealed override IOperation Apply() {
       List<IScope> scopes = new List<IScope>(CurrentScope.SubScopes);
       IScope[] selected = Select(scopes);

trunk/sources/HeuristicLab.SequentialEngine/3.3/SequentialEngine.cs

@@ -21 +21 @@
 
 using System;
-using System.Collections.Generic;
-using System.Text;
 using HeuristicLab.Core;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
@@ -57 +55 @@
     protected override void ProcessNextOperator() {
       currentOperator = null;
-      IExecutionSequence next = ExecutionStack.Pop();
-      ExecutionContextCollection coll = next as ExecutionContextCollection;
+      IOperation next = ExecutionStack.Pop();
+      OperationCollection coll = next as OperationCollection;
       while (coll != null) {
         for (int i = coll.Count - 1; i >= 0; i--)
           ExecutionStack.Push(coll[i]);
         next = ExecutionStack.Count > 0 ? ExecutionStack.Pop() : null;
-        coll = next as ExecutionContextCollection;
+        coll = next as OperationCollection;
       }
-      ExecutionContext context = next as ExecutionContext;
-      if (context != null) {
+      IAtomicOperation operation = next as IAtomicOperation;
+      if (operation != null) {
         try {
-          currentOperator = context.Operator;
-          ExecutionStack.Push(context.Operator.Execute(context));
+          currentOperator = operation.Operator;
+          ExecutionStack.Push(operation.Operator.Execute((IExecutionContext)operation));
           currentOperator = null;
         }
         catch (Exception ex) {
-          ExecutionStack.Push(context);
+          ExecutionStack.Push(operation);
           Stop();
           OnExceptionOccurred(ex);
         }
-        if (context.Operator.Breakpoint)
+        if (operation.Operator.Breakpoint)
           Stop();
       }