Changeset 2796 for trunk/sources/HeuristicLab.Core.Views/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.Views/3.3

Files:

• CreateParameterDialog.Designer.cs (modified) (5 diffs)
• CreateParameterDialog.cs (modified) (3 diffs)
• EngineView.Designer.cs (modified) (11 diffs)
• EngineView.cs (modified) (9 diffs)
• HeuristicLab.Core.Views-3.3.csproj (modified) (3 diffs)
• HeuristicLabCoreViewsPlugin.cs.frame (modified) (1 diff)
• ItemArrayView.Designer.cs (modified) (4 diffs)
• ItemCollectionView.Designer.cs (modified) (7 diffs)
• ItemListView.Designer.cs (modified) (7 diffs)
• OperatorView.Designer.cs (moved) (moved from trunk/sources/HeuristicLab.Operators.Views/3.3/OperatorView.Designer.cs) (2 diffs)
• OperatorView.cs (moved) (moved from trunk/sources/HeuristicLab.Operators.Views/3.3/OperatorView.cs) (1 diff)
• ParameterCollectionView.cs (modified) (1 diff)
• ProblemView.Designer.cs (added)
• ProblemView.cs (added)
• ValueParameterCollectionView.Designer.cs (added)
• ValueParameterCollectionView.cs (added)
• VariableView.Designer.cs (modified) (4 diffs)

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

@@ -120 +120 @@
       this.descriptionTextBox.Name = "descriptionTextBox";
       this.descriptionTextBox.ScrollBars = System.Windows.Forms.ScrollBars.Vertical;
-      this.descriptionTextBox.Size = new System.Drawing.Size(452, 103);
+      this.descriptionTextBox.Size = new System.Drawing.Size(452, 102);
       this.descriptionTextBox.TabIndex = 4;
       // 
@@ -127 +127 @@
       this.dataTypeLabel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
       this.dataTypeLabel.AutoSize = true;
-      this.dataTypeLabel.Location = new System.Drawing.Point(9, 426);
+      this.dataTypeLabel.Location = new System.Drawing.Point(12, 425);
       this.dataTypeLabel.Name = "dataTypeLabel";
       this.dataTypeLabel.Size = new System.Drawing.Size(60, 13);
@@ -138 +138 @@
                   | System.Windows.Forms.AnchorStyles.Right)));
       this.dataTypeTextBox.Enabled = false;
-      this.dataTypeTextBox.Location = new System.Drawing.Point(78, 423);
+      this.dataTypeTextBox.Location = new System.Drawing.Point(78, 422);
       this.dataTypeTextBox.Name = "dataTypeTextBox";
       this.dataTypeTextBox.ReadOnly = true;
-      this.dataTypeTextBox.Size = new System.Drawing.Size(423, 20);
+      this.dataTypeTextBox.Size = new System.Drawing.Size(422, 20);
       this.dataTypeTextBox.TabIndex = 6;
       // 
@@ -149 +149 @@
       this.setDataTypeButton.Enabled = false;
       this.setDataTypeButton.Image = HeuristicLab.Common.Resources.VS2008ImageLibrary.Add;
-      this.setDataTypeButton.Location = new System.Drawing.Point(507, 421);
+      this.setDataTypeButton.Location = new System.Drawing.Point(506, 420);
       this.setDataTypeButton.Name = "setDataTypeButton";
-      this.setDataTypeButton.Size = new System.Drawing.Size(23, 23);
+      this.setDataTypeButton.Size = new System.Drawing.Size(24, 24);
       this.setDataTypeButton.TabIndex = 7;
       this.toolTip.SetToolTip(this.setDataTypeButton, "Set Data Type");
@@ -193 +193 @@
       this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
       this.Text = "Create Parameter";
-      this.Load += new System.EventHandler(this.CreateParameterDialog_Load);
       this.ResumeLayout(false);
       this.PerformLayout();

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

@@ -35 +35 @@
     protected TypeSelectorDialog typeSelectorDialog;
 
+    public TypeSelector ParameterTypeSelector {
+      get { return parameterTypeSelector; }
+    }
     public IParameter Parameter {
       get {
@@ -56 +59 @@
     public CreateParameterDialog() {
       InitializeComponent();
+      parameterTypeSelector.Configure(typeof(IParameter), false, true);
     }
 
@@ -70 +74 @@
       }
       okButton.Enabled = dataTypeTextBox.Tag != null;
-    }
-
-    protected virtual void CreateParameterDialog_Load(object sender, EventArgs e) {
-      parameterTypeSelector.Configure(typeof(IParameter), false, true);
     }
 

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

@@ -33 +33 @@
     protected override void Dispose(bool disposing) {
       if (disposing) {
+        if (typeSelectorDialog != null) typeSelectorDialog.Dispose();
         if (components != null) components.Dispose();
       }
@@ -54 +55 @@
       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();
+      this.saveOperatorGraphButton = new System.Windows.Forms.Button();
       this.tabControl = new System.Windows.Forms.TabControl();
       this.operatorGraphTabPage = new System.Windows.Forms.TabPage();
       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();
       this.tabControl.SuspendLayout();
       this.operatorGraphTabPage.SuspendLayout();
       this.globalScopeTabPage.SuspendLayout();
+      this.problemTabPage.SuspendLayout();
       this.SuspendLayout();
       // 
@@ -87 +99 @@
                   | System.Windows.Forms.AnchorStyles.Right)));
       this.operatorGraphView.Caption = "Operator Graph";
-      this.operatorGraphView.Location = new System.Drawing.Point(6, 6);
+      this.operatorGraphView.Content = null;
+      this.operatorGraphView.Location = new System.Drawing.Point(6, 36);
       this.operatorGraphView.Name = "operatorGraphView";
-      this.operatorGraphView.Size = new System.Drawing.Size(782, 573);
-      this.operatorGraphView.TabIndex = 0;
+      this.operatorGraphView.Size = new System.Drawing.Size(782, 542);
+      this.operatorGraphView.TabIndex = 3;
       // 
       // scopeView
@@ -98 +111 @@
                   | System.Windows.Forms.AnchorStyles.Right)));
       this.scopeView.Caption = "Scope";
+      this.scopeView.Content = null;
       this.scopeView.Location = new System.Drawing.Point(6, 6);
       this.scopeView.Name = "scopeView";
-      this.scopeView.Size = new System.Drawing.Size(782, 573);
+      this.scopeView.Size = new System.Drawing.Size(782, 572);
       this.scopeView.TabIndex = 0;
       // 
@@ -107 +121 @@
       this.resetButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
       this.resetButton.Image = HeuristicLab.Common.Resources.VS2008ImageLibrary.Restart;
-      this.resetButton.Location = new System.Drawing.Point(58, 617);
+      this.resetButton.Location = new System.Drawing.Point(60, 616);
       this.resetButton.Name = "resetButton";
-      this.resetButton.Size = new System.Drawing.Size(23, 23);
+      this.resetButton.Size = new System.Drawing.Size(24, 24);
       this.resetButton.TabIndex = 3;
       this.toolTip.SetToolTip(this.resetButton, "Reset Engine");
@@ -120 +134 @@
       this.stopButton.Enabled = false;
       this.stopButton.Image = HeuristicLab.Common.Resources.VS2008ImageLibrary.Stop;
-      this.stopButton.Location = new System.Drawing.Point(29, 617);
+      this.stopButton.Location = new System.Drawing.Point(30, 616);
       this.stopButton.Name = "stopButton";
-      this.stopButton.Size = new System.Drawing.Size(23, 23);
+      this.stopButton.Size = new System.Drawing.Size(24, 24);
       this.stopButton.TabIndex = 2;
       this.toolTip.SetToolTip(this.stopButton, "Stop Engine");
@@ -132 +146 @@
       this.startButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
       this.startButton.Image = HeuristicLab.Common.Resources.VS2008ImageLibrary.Play;
-      this.startButton.Location = new System.Drawing.Point(0, 617);
+      this.startButton.Location = new System.Drawing.Point(0, 616);
       this.startButton.Name = "startButton";
-      this.startButton.Size = new System.Drawing.Size(23, 23);
+      this.startButton.Size = new System.Drawing.Size(24, 24);
       this.startButton.TabIndex = 1;
       this.toolTip.SetToolTip(this.startButton, "Start Engine");
       this.startButton.UseVisualStyleBackColor = true;
       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
+      // 
+      this.newOperatorGraphButton.Image = HeuristicLab.Common.Resources.VS2008ImageLibrary.NewDocument;
+      this.newOperatorGraphButton.Location = new System.Drawing.Point(6, 6);
+      this.newOperatorGraphButton.Name = "newOperatorGraphButton";
+      this.newOperatorGraphButton.Size = new System.Drawing.Size(24, 24);
+      this.newOperatorGraphButton.TabIndex = 0;
+      this.toolTip.SetToolTip(this.newOperatorGraphButton, "Create New Operator Graph");
+      this.newOperatorGraphButton.UseVisualStyleBackColor = true;
+      this.newOperatorGraphButton.Click += new System.EventHandler(this.newOperatorGraphButton_Click);
+      // 
+      // openOperatorGraphButton
+      // 
+      this.openOperatorGraphButton.Image = HeuristicLab.Common.Resources.VS2008ImageLibrary.Open;
+      this.openOperatorGraphButton.Location = new System.Drawing.Point(36, 6);
+      this.openOperatorGraphButton.Name = "openOperatorGraphButton";
+      this.openOperatorGraphButton.Size = new System.Drawing.Size(24, 24);
+      this.openOperatorGraphButton.TabIndex = 1;
+      this.toolTip.SetToolTip(this.openOperatorGraphButton, "Open Operator Graph");
+      this.openOperatorGraphButton.UseVisualStyleBackColor = true;
+      this.openOperatorGraphButton.Click += new System.EventHandler(this.openOperatorGraphButton_Click);
+      // 
+      // saveOperatorGraphButton
+      // 
+      this.saveOperatorGraphButton.Image = HeuristicLab.Common.Resources.VS2008ImageLibrary.Save;
+      this.saveOperatorGraphButton.Location = new System.Drawing.Point(66, 6);
+      this.saveOperatorGraphButton.Name = "saveOperatorGraphButton";
+      this.saveOperatorGraphButton.Size = new System.Drawing.Size(24, 24);
+      this.saveOperatorGraphButton.TabIndex = 2;
+      this.toolTip.SetToolTip(this.saveOperatorGraphButton, "Save Operator Graph");
+      this.saveOperatorGraphButton.UseVisualStyleBackColor = true;
+      this.saveOperatorGraphButton.Click += new System.EventHandler(this.saveOperatorGraphButton_Click);
       // 
       // tabControl
@@ -147 +227 @@
       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";
       this.tabControl.SelectedIndex = 0;
-      this.tabControl.Size = new System.Drawing.Size(802, 611);
-      this.tabControl.TabIndex = 0;
+      this.tabControl.Size = new System.Drawing.Size(802, 610);
+      this.tabControl.TabIndex = 3;
       // 
       // operatorGraphTabPage
       // 
+      this.operatorGraphTabPage.Controls.Add(this.saveOperatorGraphButton);
+      this.operatorGraphTabPage.Controls.Add(this.openOperatorGraphButton);
+      this.operatorGraphTabPage.Controls.Add(this.newOperatorGraphButton);
       this.operatorGraphTabPage.Controls.Add(this.operatorGraphView);
       this.operatorGraphTabPage.Location = new System.Drawing.Point(4, 22);
       this.operatorGraphTabPage.Name = "operatorGraphTabPage";
       this.operatorGraphTabPage.Padding = new System.Windows.Forms.Padding(3);
-      this.operatorGraphTabPage.Size = new System.Drawing.Size(794, 585);
+      this.operatorGraphTabPage.Size = new System.Drawing.Size(794, 584);
       this.operatorGraphTabPage.TabIndex = 0;
       this.operatorGraphTabPage.Text = "Operator Graph";
@@ -170 +254 @@
       this.globalScopeTabPage.Name = "globalScopeTabPage";
       this.globalScopeTabPage.Padding = new System.Windows.Forms.Padding(3);
-      this.globalScopeTabPage.Size = new System.Drawing.Size(794, 585);
+      this.globalScopeTabPage.Size = new System.Drawing.Size(794, 584);
       this.globalScopeTabPage.TabIndex = 1;
       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;
+      // 
+      // openFileDialog
+      // 
+      this.openFileDialog.DefaultExt = "hl";
+      this.openFileDialog.FileName = "Item";
+      this.openFileDialog.Filter = "HeuristicLab Files|*.hl|All Files|*.*";
+      this.openFileDialog.Title = "Open File";
+      // 
+      // saveFileDialog
+      // 
+      this.saveFileDialog.DefaultExt = "hl";
+      this.saveFileDialog.FileName = "Item";
+      this.saveFileDialog.Filter = "Uncompressed HeuristicLab Files|*.hl|HeuristicLab Files|*.hl|All Files|*.*";
+      this.saveFileDialog.FilterIndex = 2;
+      this.saveFileDialog.Title = "Save File";
       // 
       // EngineView
@@ -190 +314 @@
       this.operatorGraphTabPage.ResumeLayout(false);
       this.globalScopeTabPage.ResumeLayout(false);
+      this.problemTabPage.ResumeLayout(false);
       this.ResumeLayout(false);
       this.PerformLayout();
@@ -208 +333 @@
     protected System.Windows.Forms.TabPage operatorGraphTabPage;
     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 saveOperatorGraphButton;
+    protected System.Windows.Forms.Button openOperatorGraphButton;
+    protected System.Windows.Forms.Button newOperatorGraphButton;
+    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

@@ -30 +30 @@
 using HeuristicLab.Common;
 using HeuristicLab.MainForm;
+using HeuristicLab.Persistence.Default.Xml;
 
 namespace HeuristicLab.Core.Views {
@@ -38 +39 @@
   [Content(typeof(IEngine), false)]
   public partial class EngineView : ItemView {
+    protected TypeSelectorDialog typeSelectorDialog;
     private int executionTimeCounter;
 
@@ -66 +68 @@
     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);
@@ -81 +84 @@
       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);
@@ -96 +100 @@
       stopButton.Enabled = false;
       if (Content == null) {
+        newOperatorGraphButton.Enabled = openOperatorGraphButton.Enabled = saveOperatorGraphButton.Enabled = false;
         operatorGraphView.Enabled = false;
         scopeView.Enabled = false;
-        startButton.Enabled = false;
-        resetButton.Enabled = false;
+        newProblemButton.Enabled = openProblemButton.Enabled = saveProblemButton.Enabled = false;
+        problemViewHost.Enabled = false;
+        startButton.Enabled = resetButton.Enabled = false;
         executionTimeTextBox.Enabled = false;
       } else {
+        newOperatorGraphButton.Enabled = openOperatorGraphButton.Enabled = saveOperatorGraphButton.Enabled = true;
         operatorGraphView.Content = Content.OperatorGraph;
+        operatorGraphView.Enabled = true;
         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;
@@ -118 +131 @@
         operatorGraphView.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) {
       if (InvokeRequired)
         Invoke(new EventHandler(Content_Prepared), sender, e);
       else {
+        newOperatorGraphButton.Enabled = openOperatorGraphButton.Enabled = saveOperatorGraphButton.Enabled = true;
         operatorGraphView.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;
@@ -135 +160 @@
         Invoke(new EventHandler(Content_Started), sender, e);
       else {
+        newOperatorGraphButton.Enabled = openOperatorGraphButton.Enabled = saveOperatorGraphButton.Enabled = false;
         operatorGraphView.Enabled = false;
         scopeView.Enabled = false;
+        newProblemButton.Enabled = openProblemButton.Enabled = saveProblemButton.Enabled = false;
+        problemViewHost.Enabled = false;
         startButton.Enabled = false;
         stopButton.Enabled = true;
@@ -147 +175 @@
         Invoke(new EventHandler(Content_Stopped), sender, e);
       else {
+        newOperatorGraphButton.Enabled = openOperatorGraphButton.Enabled = saveOperatorGraphButton.Enabled = true;
         operatorGraphView.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;
@@ -171 +203 @@
 
     #region Button events
+    protected void newOperatorGraphButton_Click(object sender, EventArgs e) {
+      Content.OperatorGraph = new OperatorGraph();
+    }
+    protected void openOperatorGraphButton_Click(object sender, EventArgs e) {
+      openFileDialog.Title = "Open Operator Graph";
+      if (openFileDialog.ShowDialog(this) == DialogResult.OK) {
+        OperatorGraph operatorGraph = null;
+        try {
+          operatorGraph = XmlParser.Deserialize(openFileDialog.FileName) as OperatorGraph;
+        }
+        catch (Exception ex) {
+          Auxiliary.ShowErrorMessageBox(ex);
+        }
+        if (operatorGraph == null)
+          MessageBox.Show(this, "Selected file does not contain an operator graph.", "Invalid File", MessageBoxButtons.OK, MessageBoxIcon.Error);
+        else
+          Content.OperatorGraph = operatorGraph;
+      }
+    }
+    protected void saveOperatorGraphButton_Click(object sender, EventArgs e) {
+      saveFileDialog.Title = "Save Operator Graph";
+      if (saveFileDialog.ShowDialog(this) == DialogResult.OK) {
+        try {
+          if (saveFileDialog.FilterIndex == 1)
+            XmlGenerator.Serialize(Content.OperatorGraph, saveFileDialog.FileName, 0);
+          else
+            XmlGenerator.Serialize(Content.OperatorGraph, saveFileDialog.FileName, 9);
+        }
+        catch (Exception ex) {
+          Auxiliary.ShowErrorMessageBox(ex);
+        }
+      }
+    }
+    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

@@ -53 +53 @@
   <ItemGroup>
     <None Include="HeuristicLabCoreViewsPlugin.cs.frame" />
+    <Compile Include="ValueParameterCollectionView.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="ValueParameterCollectionView.Designer.cs">
+      <DependentUpon>ValueParameterCollectionView.cs</DependentUpon>
+    </Compile>
     <Compile Include="ItemArrayView.cs">
       <SubType>UserControl</SubType>
@@ -107 +113 @@
     <Compile Include="OperatorTreeView.Designer.cs">
       <DependentUpon>OperatorTreeView.cs</DependentUpon>
+    </Compile>
+    <Compile Include="OperatorView.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="OperatorView.Designer.cs">
+      <DependentUpon>OperatorView.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">
@@ -223 +241 @@
       <Project>{3BD61258-31DA-4B09-89C0-4F71FEF5F05A}</Project>
       <Name>HeuristicLab.MainForm-3.2</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\HeuristicLab.Persistence\3.3\HeuristicLab.Persistence-3.3.csproj">
+      <Project>{102BC7D3-0EF9-439C-8F6D-96FF0FDB8E1B}</Project>
+      <Name>HeuristicLab.Persistence-3.3</Name>
     </ProjectReference>
     <ProjectReference Include="..\..\HeuristicLab.PluginInfrastructure\HeuristicLab.PluginInfrastructure.csproj">

trunk/sources/HeuristicLab.Core.Views/3.3/HeuristicLabCoreViewsPlugin.cs.frame

@@ -37 +37 @@
   [PluginDependency("HeuristicLab.MainForm", "3.2")]
   [PluginDependency("HeuristicLab.MainForm.WindowsForms", "3.2")]
+  [PluginDependency("HeuristicLab.Persistence", "3.3")]
   public class HeuristicLabCoreViewsPlugin : PluginBase {
   }

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

@@ -96 +96 @@
       this.moveUpButton.Location = new System.Drawing.Point(3, 3);
       this.moveUpButton.Name = "moveUpButton";
-      this.moveUpButton.Size = new System.Drawing.Size(23, 23);
+      this.moveUpButton.Size = new System.Drawing.Size(24, 24);
       this.moveUpButton.TabIndex = 0;
       this.toolTip.SetToolTip(this.moveUpButton, "Move Up");
@@ -106 +106 @@
       this.moveDownButton.Enabled = false;
       this.moveDownButton.Image = HeuristicLab.Common.Resources.VS2008ImageLibrary.ArrowDown;
-      this.moveDownButton.Location = new System.Drawing.Point(32, 3);
+      this.moveDownButton.Location = new System.Drawing.Point(33, 3);
       this.moveDownButton.Name = "moveDownButton";
-      this.moveDownButton.Size = new System.Drawing.Size(23, 23);
+      this.moveDownButton.Size = new System.Drawing.Size(24, 24);
       this.moveDownButton.TabIndex = 1;
       this.toolTip.SetToolTip(this.moveDownButton, "Move Down");
@@ -124 +124 @@
       this.itemsListView.HeaderStyle = System.Windows.Forms.ColumnHeaderStyle.None;
       this.itemsListView.HideSelection = false;
-      this.itemsListView.Location = new System.Drawing.Point(3, 32);
+      this.itemsListView.Location = new System.Drawing.Point(3, 33);
       this.itemsListView.Name = "itemsListView";
       this.itemsListView.ShowItemToolTips = true;
-      this.itemsListView.Size = new System.Drawing.Size(194, 287);
+      this.itemsListView.Size = new System.Drawing.Size(194, 286);
       this.itemsListView.SmallImageList = this.imageList;
       this.itemsListView.TabIndex = 2;
@@ -153 +153 @@
                   | System.Windows.Forms.AnchorStyles.Right)));
       this.detailsGroupBox.Controls.Add(this.viewHost);
-      this.detailsGroupBox.Location = new System.Drawing.Point(3, 26);
+      this.detailsGroupBox.Location = new System.Drawing.Point(3, 27);
       this.detailsGroupBox.Name = "detailsGroupBox";
       this.detailsGroupBox.Size = new System.Drawing.Size(283, 294);

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

@@ -104 +104 @@
       this.itemsListView.HeaderStyle = System.Windows.Forms.ColumnHeaderStyle.None;
       this.itemsListView.HideSelection = false;
-      this.itemsListView.Location = new System.Drawing.Point(3, 32);
+      this.itemsListView.Location = new System.Drawing.Point(3, 33);
       this.itemsListView.Name = "itemsListView";
       this.itemsListView.ShowItemToolTips = true;
-      this.itemsListView.Size = new System.Drawing.Size(244, 328);
+      this.itemsListView.Size = new System.Drawing.Size(244, 327);
       this.itemsListView.SmallImageList = this.imageList;
       this.itemsListView.TabIndex = 4;
@@ -131 +131 @@
       this.sortDescendingButton.Enabled = false;
       this.sortDescendingButton.Image = HeuristicLab.Common.Resources.VS2008ImageLibrary.SortUp;
-      this.sortDescendingButton.Location = new System.Drawing.Point(32, 3);
+      this.sortDescendingButton.Location = new System.Drawing.Point(33, 3);
       this.sortDescendingButton.Name = "sortDescendingButton";
-      this.sortDescendingButton.Size = new System.Drawing.Size(23, 23);
+      this.sortDescendingButton.Size = new System.Drawing.Size(24, 24);
       this.sortDescendingButton.TabIndex = 1;
       this.toolTip.SetToolTip(this.sortDescendingButton, "Sort Descending");
@@ -143 +143 @@
       this.sortAscendingButton.Enabled = false;
       this.sortAscendingButton.Image = HeuristicLab.Common.Resources.VS2008ImageLibrary.Sort;
-      this.sortAscendingButton.Location = new System.Drawing.Point(61, 3);
+      this.sortAscendingButton.Location = new System.Drawing.Point(63, 3);
       this.sortAscendingButton.Name = "sortAscendingButton";
-      this.sortAscendingButton.Size = new System.Drawing.Size(23, 23);
+      this.sortAscendingButton.Size = new System.Drawing.Size(24, 24);
       this.sortAscendingButton.TabIndex = 2;
       this.toolTip.SetToolTip(this.sortAscendingButton, "Sort Ascending");
@@ -155 +155 @@
       this.removeButton.Enabled = false;
       this.removeButton.Image = HeuristicLab.Common.Resources.VS2008ImageLibrary.Remove;
-      this.removeButton.Location = new System.Drawing.Point(90, 3);
+      this.removeButton.Location = new System.Drawing.Point(93, 3);
       this.removeButton.Name = "removeButton";
-      this.removeButton.Size = new System.Drawing.Size(23, 23);
+      this.removeButton.Size = new System.Drawing.Size(24, 24);
       this.removeButton.TabIndex = 3;
       this.toolTip.SetToolTip(this.removeButton, "Remove");
@@ -168 +168 @@
       this.addButton.Location = new System.Drawing.Point(3, 3);
       this.addButton.Name = "addButton";
-      this.addButton.Size = new System.Drawing.Size(23, 23);
+      this.addButton.Size = new System.Drawing.Size(24, 24);
       this.addButton.TabIndex = 0;
       this.toolTip.SetToolTip(this.addButton, "Add");
@@ -180 +180 @@
                   | System.Windows.Forms.AnchorStyles.Right)));
       this.detailsGroupBox.Controls.Add(this.viewHost);
-      this.detailsGroupBox.Location = new System.Drawing.Point(3, 26);
+      this.detailsGroupBox.Location = new System.Drawing.Point(3, 27);
       this.detailsGroupBox.Name = "detailsGroupBox";
       this.detailsGroupBox.Size = new System.Drawing.Size(266, 335);
@@ -192 +192 @@
                   | System.Windows.Forms.AnchorStyles.Left)
                   | System.Windows.Forms.AnchorStyles.Right)));
+      this.viewHost.Content = null;
       this.viewHost.Location = new System.Drawing.Point(6, 19);
       this.viewHost.Name = "viewHost";
-      this.viewHost.Content = null;
       this.viewHost.Size = new System.Drawing.Size(254, 310);
       this.viewHost.TabIndex = 0;

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

@@ -96 +96 @@
       this.removeButton.Enabled = false;
       this.removeButton.Image = HeuristicLab.Common.Resources.VS2008ImageLibrary.Remove;
-      this.removeButton.Location = new System.Drawing.Point(90, 3);
+      this.removeButton.Location = new System.Drawing.Point(93, 3);
       this.removeButton.Name = "removeButton";
-      this.removeButton.Size = new System.Drawing.Size(23, 23);
+      this.removeButton.Size = new System.Drawing.Size(24, 24);
       this.removeButton.TabIndex = 3;
       this.toolTip.SetToolTip(this.removeButton, "Remove");
@@ -108 +108 @@
       this.moveUpButton.Enabled = false;
       this.moveUpButton.Image = HeuristicLab.Common.Resources.VS2008ImageLibrary.ArrowUp;
-      this.moveUpButton.Location = new System.Drawing.Point(32, 3);
+      this.moveUpButton.Location = new System.Drawing.Point(33, 3);
       this.moveUpButton.Name = "moveUpButton";
-      this.moveUpButton.Size = new System.Drawing.Size(23, 23);
+      this.moveUpButton.Size = new System.Drawing.Size(24, 24);
       this.moveUpButton.TabIndex = 1;
       this.toolTip.SetToolTip(this.moveUpButton, "Move Up");
@@ -120 +120 @@
       this.moveDownButton.Enabled = false;
       this.moveDownButton.Image = HeuristicLab.Common.Resources.VS2008ImageLibrary.ArrowDown;
-      this.moveDownButton.Location = new System.Drawing.Point(61, 3);
+      this.moveDownButton.Location = new System.Drawing.Point(63, 3);
       this.moveDownButton.Name = "moveDownButton";
-      this.moveDownButton.Size = new System.Drawing.Size(23, 23);
+      this.moveDownButton.Size = new System.Drawing.Size(24, 24);
       this.moveDownButton.TabIndex = 2;
       this.toolTip.SetToolTip(this.moveDownButton, "Move Down");
@@ -138 +138 @@
       this.itemsListView.HeaderStyle = System.Windows.Forms.ColumnHeaderStyle.None;
       this.itemsListView.HideSelection = false;
-      this.itemsListView.Location = new System.Drawing.Point(3, 32);
+      this.itemsListView.Location = new System.Drawing.Point(3, 33);
       this.itemsListView.Name = "itemsListView";
       this.itemsListView.ShowItemToolTips = true;
-      this.itemsListView.Size = new System.Drawing.Size(194, 287);
+      this.itemsListView.Size = new System.Drawing.Size(194, 286);
       this.itemsListView.SmallImageList = this.imageList;
       this.itemsListView.TabIndex = 4;
@@ -166 +166 @@
       this.addButton.Location = new System.Drawing.Point(3, 3);
       this.addButton.Name = "addButton";
-      this.addButton.Size = new System.Drawing.Size(23, 23);
+      this.addButton.Size = new System.Drawing.Size(24, 24);
       this.addButton.TabIndex = 0;
       this.toolTip.SetToolTip(this.addButton, "Add");
@@ -178 +178 @@
                   | System.Windows.Forms.AnchorStyles.Right)));
       this.detailsGroupBox.Controls.Add(this.viewHost);
-      this.detailsGroupBox.Location = new System.Drawing.Point(3, 26);
+      this.detailsGroupBox.Location = new System.Drawing.Point(3, 27);
       this.detailsGroupBox.Name = "detailsGroupBox";
       this.detailsGroupBox.Size = new System.Drawing.Size(283, 294);
@@ -190 +190 @@
                   | System.Windows.Forms.AnchorStyles.Left)
                   | System.Windows.Forms.AnchorStyles.Right)));
+      this.viewHost.Content = null;
       this.viewHost.Location = new System.Drawing.Point(6, 19);
       this.viewHost.Name = "viewHost";
-      this.viewHost.Content = null;
       this.viewHost.Size = new System.Drawing.Size(271, 269);
       this.viewHost.TabIndex = 0;

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

@@ -20 +20 @@
 #endregion
 
-namespace HeuristicLab.Operators.Views {
+namespace HeuristicLab.Core.Views {
   partial class OperatorView {
     /// <summary> 
@@ -94 +94 @@
     protected HeuristicLab.Core.Views.ParameterCollectionView parameterCollectionView;
 
-
   }
 }

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

@@ -20 +20 @@
 #endregion
 
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Drawing;
-using System.Data;
-using System.Text;
-using System.Windows.Forms;
-using HeuristicLab.Core;
-using HeuristicLab.Core.Views;
 using HeuristicLab.MainForm;
 
-namespace HeuristicLab.Operators.Views { 
+namespace HeuristicLab.Core.Views {
   /// <summary>
   /// The base class for visual representations of items.

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

@@ -1 @@
-using System;
+#region License Information
+/* HeuristicLab
+ * Copyright (C) 2002-2010 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ *
+ * This file is part of HeuristicLab.
+ *
+ * HeuristicLab is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * HeuristicLab is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with HeuristicLab. If not, see <http://www.gnu.org/licenses/>.
+ */
+#endregion
+
+using System;
 using System.Collections.Generic;
 using System.ComponentModel;

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

@@ -112 +112 @@
                   | System.Windows.Forms.AnchorStyles.Right)));
       this.valuePanel.Controls.Add(this.viewHost);
-      this.valuePanel.Location = new System.Drawing.Point(6, 48);
+      this.valuePanel.Location = new System.Drawing.Point(6, 49);
       this.valuePanel.Name = "valuePanel";
-      this.valuePanel.Size = new System.Drawing.Size(347, 100);
+      this.valuePanel.Size = new System.Drawing.Size(347, 99);
       this.valuePanel.TabIndex = 2;
       this.valuePanel.DragOver += new System.Windows.Forms.DragEventHandler(this.valuePanel_DragEnterOver);
@@ -122 +122 @@
       // viewHost
       // 
+      this.viewHost.Content = null;
       this.viewHost.Dock = System.Windows.Forms.DockStyle.Fill;
       this.viewHost.Location = new System.Drawing.Point(0, 0);
       this.viewHost.Name = "viewHost";
-      this.viewHost.Content = null;
-      this.viewHost.Size = new System.Drawing.Size(347, 100);
+      this.viewHost.Size = new System.Drawing.Size(347, 99);
       this.viewHost.TabIndex = 0;
       // 
@@ -132 +132 @@
       // 
       this.clearValueButton.Image = HeuristicLab.Common.Resources.VS2008ImageLibrary.Remove;
-      this.clearValueButton.Location = new System.Drawing.Point(35, 19);
+      this.clearValueButton.Location = new System.Drawing.Point(36, 19);
       this.clearValueButton.Name = "clearValueButton";
-      this.clearValueButton.Size = new System.Drawing.Size(23, 23);
+      this.clearValueButton.Size = new System.Drawing.Size(24, 24);
       this.clearValueButton.TabIndex = 1;
       this.toolTip.SetToolTip(this.clearValueButton, "Clear Value");
@@ -145 +145 @@
       this.setValueButton.Location = new System.Drawing.Point(6, 19);
       this.setValueButton.Name = "setValueButton";
-      this.setValueButton.Size = new System.Drawing.Size(23, 23);
+      this.setValueButton.Size = new System.Drawing.Size(24, 24);
       this.setValueButton.TabIndex = 1;
       this.toolTip.SetToolTip(this.setValueButton, "Set Value");