Changeset 2212 for branches/GP-Refactoring-713/sources/HeuristicLab.GP/3.3

Timestamp:

07/30/09 10:47:00 (15 years ago)

Author:

gkronber

Message:

GP Refactoring: #713

• added project GP.Operators
• moved operators from plugin GP to plugin GP.Operators
• deleted unused constraints
• removed dependency of GP plugins on Constraints plugin
• moved StructID functions into directory Symbols
• deleted unused class FunView
• implemented add and remove functionality for the FunctionLibraryView

Location:

branches/GP-Refactoring-713/sources/HeuristicLab.GP/3.3

Files:

• BaseClasses/BinaryFunction.cs (modified) (1 diff)
• BaseClasses/FunctionBase.cs (modified) (3 diffs)
• BaseClasses/Terminal.cs (modified) (1 diff)
• BaseClasses/UnaryFunction.cs (modified) (1 diff)
• FunView.Designer.cs (deleted)
• FunView.cs (deleted)
• FunctionLibrary.cs (modified) (2 diffs)
• FunctionLibraryEditor.Designer.cs (modified) (7 diffs)
• FunctionLibraryEditor.cs (modified) (3 diffs)
• FunctionTreeView.Designer.cs (modified) (5 diffs)
• FunctionTreeView.cs (modified) (3 diffs)
• FunctionTreeView.resx (modified) (1 diff)
• HeuristicLab.GP-3.3.csproj (modified) (2 diffs)
• HeuristicLabGPPlugin.cs (modified) (1 diff)
• TreeGardener.cs (modified) (12 diffs)

branches/GP-Refactoring-713/sources/HeuristicLab.GP/3.3/BaseClasses/BinaryFunction.cs

@@ -24 +24 @@
 using System.Linq;
 using System.Text;
-using HeuristicLab.Constraints;
 
 namespace HeuristicLab.GP {

branches/GP-Refactoring-713/sources/HeuristicLab.GP/3.3/BaseClasses/FunctionBase.cs

@@ -23 +23 @@
 using System.Collections.Generic;
 using System.Text;
-using HeuristicLab.Data;
 using HeuristicLab.Core;
 using System.Xml;
-using HeuristicLab.Constraints;
 using System.Diagnostics;
 using HeuristicLab.GP.Interfaces;
@@ -111 +109 @@
     }
 
-    //private List<IConstraint> constraints = new List<IConstraint>();
-    //public ICollection<IConstraint> Constraints {
-    //  get { return constraints; }
-    //}
-
-    //private void RefreshArity() {
-    //  minArity = 2; maxArity = 2; // default arity is 2
-    //  foreach (IConstraint constraint in Constraints) {
-    //    NumberOfSubOperatorsConstraint theConstraint = constraint as NumberOfSubOperatorsConstraint;
-    //    if (theConstraint != null) {
-    //      minArity = theConstraint.MinOperators.Data;
-    //      maxArity = theConstraint.MaxOperators.Data;
-    //    }
-    //  }
-    //}
-
     public ICollection<IFunction> GetAllowedSubFunctions(int index) {
       if (index < 0 || index > MaxSubTrees) throw new ArgumentException("Index outside of allowed range. index = " + index);
-      //if (allowedSubFunctions == null) {
-      //  // first time: analyze the constraint and create a cached copy of the allowed sub-functions
-      //  allowedSubFunctions = new List<IFunction>[MaxArity];
-      //  for (int i = 0; i < MaxArity; i++) {
-      //    allowedSubFunctions[i] = GetAllowedSubFunctions(i);
-      //  }
-      //}
       return allowedSubFunctions[index];
     }
@@ -156 +131 @@
     public bool IsAllowedSubFunction(IFunction function, int index) {
       return GetAllowedSubFunctions(index).Contains(function);
-    }
-
-    //private List<IFunction> GetAllowedSubFunctions(int index) {
-    //  List<IFunction> allowedSubFunctions = new List<IFunction>();
-    //  foreach (IConstraint constraint in Constraints) {
-    //    if (constraint is SubOperatorTypeConstraint) {
-    //      SubOperatorTypeConstraint subOpConstraint = constraint as SubOperatorTypeConstraint;
-    //      if (subOpConstraint.SubOperatorIndex.Data == index) {
-    //        foreach (IFunction f in subOpConstraint.AllowedSubOperators) allowedSubFunctions.Add(f);
-    //        subOpConstraint.Changed += new EventHandler(subOpConstraint_Changed); // register an event-handler to invalidate the cache on constraint changes
-    //        return allowedSubFunctions;
-    //      }
-    //    } else if (constraint is AllSubOperatorsTypeConstraint) {
-    //      AllSubOperatorsTypeConstraint subOpConstraint = constraint as AllSubOperatorsTypeConstraint;
-    //      foreach (IFunction f in subOpConstraint.AllowedSubOperators) allowedSubFunctions.Add(f);
-    //      subOpConstraint.Changed += new EventHandler(subOpConstraint_Changed); // register an event-handler to invalidate the cache on constraint changes
-    //      return allowedSubFunctions;
-    //    }
-    //  }
-    //  return allowedSubFunctions;
-    //}
-
-    //private void subOpConstraint_Changed(object sender, EventArgs e) {
-    //  allowedSubFunctions = null;
-    //}
-
-    public override IView CreateView() {
-      return new FunView(this);
     }
 

branches/GP-Refactoring-713/sources/HeuristicLab.GP/3.3/BaseClasses/Terminal.cs

@@ -24 +24 @@
 using System.Linq;
 using System.Text;
-using HeuristicLab.Constraints;
 
 namespace HeuristicLab.GP {

branches/GP-Refactoring-713/sources/HeuristicLab.GP/3.3/BaseClasses/UnaryFunction.cs

@@ -24 +24 @@
 using System.Linq;
 using System.Text;
-using HeuristicLab.Constraints;
 
 namespace HeuristicLab.GP {

branches/GP-Refactoring-713/sources/HeuristicLab.GP/3.3/FunctionLibrary.cs

@@ -26 +26 @@
 using HeuristicLab.Core;
 using System.Xml;
-using HeuristicLab.Data;
-using HeuristicLab.Constraints;
 using HeuristicLab.GP.Interfaces;
 
@@ -41 +39 @@
     }
 
-
     public void AddFunction(IFunction fun) {
-      if (!functions.Contains(fun)) functions.Add(fun);
-      // OnFunctionAdded(fun);
+      if (!functions.Contains(fun)) {
+        functions.Add(fun);
+        OnChanged();
+      }
     }
-
-    //void UpdateTreeBounds(object sender, EventArgs e) {
-    //  RecalculateMinimalTreeBounds();
-    //}
-
-
-    //private void GetMinMaxArity(IOperator op, out int minArity, out int maxArity) {
-    //  foreach (IConstraint constraint in op.Constraints) {
-    //    NumberOfSubOperatorsConstraint theConstraint = constraint as NumberOfSubOperatorsConstraint;
-    //    if (theConstraint != null) {
-    //      minArity = theConstraint.MinOperators.Data;
-    //      maxArity = theConstraint.MaxOperators.Data;
-    //      return;
-    //    }
-    //  }
-    //  // the default arity is 2
-    //  minArity = 2;
-    //  maxArity = 2;
-    //}
 
     public void RemoveFunction(IFunction fun) {
       functions.Remove(fun);
 
-      // remove the operator from the allowed sub-functions of the remaining operators
+      // remove the operator from the allowed sub-functions of all functions
       foreach (IFunction f in Functions) {
-        if (f != fun) {
+        for (int i = 0; i < f.MaxSubTrees; i++) {
+          f.RemoveAllowedSubFunction(fun, i);
         }
       }
-      // OnFunctionRemoved(fun);
+      OnChanged();
     }
-
-    //public event EventHandler FunctionAdded;
-    //public event EventHandler FunctionRemoved;
-
-    //protected virtual void OnFunctionAdded(IFunction fun) {
-    //  if (FunctionAdded != null) {
-    //    FunctionAdded(this, new EventArgs(fun));
-    //  }
-    //}
-    //protected virtual void OnFunctionRemoved(IFunction fun) {
-    //  if (FunctionRemoved != null) {
-    //    FunctionRemoved(this, new EventArgs(fun));
-    //  }
-    //}
 
     public override IView CreateView() {

branches/GP-Refactoring-713/sources/HeuristicLab.GP/3.3/FunctionLibraryEditor.Designer.cs

@@ -45 +45 @@
     /// </summary>
     private void InitializeComponent() {
-      this.operatorLibraryEditor = new HeuristicLab.Core.OperatorLibraryEditor();
       this.tabControl = new System.Windows.Forms.TabControl();
-      this.operatorLibraryTabPage = new System.Windows.Forms.TabPage();
+      this.functionsTabPage = new System.Windows.Forms.TabPage();
       this.initializationTabPage = new System.Windows.Forms.TabPage();
       this.initSplitContainer = new System.Windows.Forms.SplitContainer();
@@ -56 +55 @@
       this.mutationListView = new System.Windows.Forms.ListView();
       this.mutationVariableView = new HeuristicLab.Core.VariableView();
+      this.addButton = new System.Windows.Forms.Button();
+      this.removeButton = new System.Windows.Forms.Button();
+      this.functionsListView = new System.Windows.Forms.ListView();
       this.tabControl.SuspendLayout();
-      this.operatorLibraryTabPage.SuspendLayout();
+      this.functionsTabPage.SuspendLayout();
       this.initializationTabPage.SuspendLayout();
       this.initSplitContainer.Panel1.SuspendLayout();
@@ -68 +70 @@
       this.SuspendLayout();
       // 
-      // operatorLibraryEditor
-      // 
-      this.operatorLibraryEditor.Caption = "Operator Library";
-      this.operatorLibraryEditor.Dock = System.Windows.Forms.DockStyle.Fill;
-      this.operatorLibraryEditor.Filename = null;
-      this.operatorLibraryEditor.Location = new System.Drawing.Point(3, 3);
-      this.operatorLibraryEditor.Name = "operatorLibraryEditor";
-      this.operatorLibraryEditor.OperatorLibrary = null;
-      this.operatorLibraryEditor.Size = new System.Drawing.Size(663, 529);
-      this.operatorLibraryEditor.TabIndex = 0;
-      // 
       // tabControl
       // 
-      this.tabControl.Controls.Add(this.operatorLibraryTabPage);
+      this.tabControl.Controls.Add(this.functionsTabPage);
       this.tabControl.Controls.Add(this.initializationTabPage);
       this.tabControl.Controls.Add(this.mutationTabPage);
@@ -91 +82 @@
       this.tabControl.TabIndex = 1;
       // 
-      // operatorLibraryTabPage
-      // 
-      this.operatorLibraryTabPage.Controls.Add(this.operatorLibraryEditor);
-      this.operatorLibraryTabPage.Location = new System.Drawing.Point(4, 22);
-      this.operatorLibraryTabPage.Name = "operatorLibraryTabPage";
-      this.operatorLibraryTabPage.Padding = new System.Windows.Forms.Padding(3);
-      this.operatorLibraryTabPage.Size = new System.Drawing.Size(669, 535);
-      this.operatorLibraryTabPage.TabIndex = 0;
-      this.operatorLibraryTabPage.Text = "Operator Library";
-      this.operatorLibraryTabPage.UseVisualStyleBackColor = true;
+      // functionsTabPage
+      // 
+      this.functionsTabPage.Controls.Add(this.functionsListView);
+      this.functionsTabPage.Controls.Add(this.removeButton);
+      this.functionsTabPage.Controls.Add(this.addButton);
+      this.functionsTabPage.Location = new System.Drawing.Point(4, 22);
+      this.functionsTabPage.Name = "functionsTabPage";
+      this.functionsTabPage.Padding = new System.Windows.Forms.Padding(3);
+      this.functionsTabPage.Size = new System.Drawing.Size(669, 535);
+      this.functionsTabPage.TabIndex = 0;
+      this.functionsTabPage.Text = "Functions";
+      this.functionsTabPage.UseVisualStyleBackColor = true;
       // 
       // initializationTabPage
@@ -201 +194 @@
       this.mutationVariableView.Variable = null;
       // 
-      // GPOperatorLibraryEditor
+      // addButton
+      // 
+      this.addButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
+      this.addButton.Location = new System.Drawing.Point(6, 506);
+      this.addButton.Name = "addButton";
+      this.addButton.Size = new System.Drawing.Size(75, 23);
+      this.addButton.TabIndex = 1;
+      this.addButton.Text = "Add...";
+      this.addButton.UseVisualStyleBackColor = true;
+      this.addButton.Click += new System.EventHandler(this.addButton_Click);
+      // 
+      // removeButton
+      // 
+      this.removeButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
+      this.removeButton.Location = new System.Drawing.Point(87, 506);
+      this.removeButton.Name = "removeButton";
+      this.removeButton.Size = new System.Drawing.Size(75, 23);
+      this.removeButton.TabIndex = 2;
+      this.removeButton.Text = "Remove";
+      this.removeButton.UseVisualStyleBackColor = true;
+      this.removeButton.Click += new System.EventHandler(this.removeButton_Click);
+      // 
+      // functionsListView
+      // 
+      this.functionsListView.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.functionsListView.Location = new System.Drawing.Point(3, 6);
+      this.functionsListView.Name = "functionsListView";
+      this.functionsListView.Size = new System.Drawing.Size(660, 494);
+      this.functionsListView.TabIndex = 3;
+      this.functionsListView.UseCompatibleStateImageBehavior = false;
+      this.functionsListView.SelectedIndexChanged += new System.EventHandler(this.functionsListView_SelectedIndexChanged);
+      // 
+      // FunctionLibraryEditor
       // 
       this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
       this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
       this.Controls.Add(this.tabControl);
-      this.Name = "GPOperatorLibraryEditor";
+      this.Name = "FunctionLibraryEditor";
       this.Size = new System.Drawing.Size(677, 561);
       this.tabControl.ResumeLayout(false);
-      this.operatorLibraryTabPage.ResumeLayout(false);
+      this.functionsTabPage.ResumeLayout(false);
       this.initializationTabPage.ResumeLayout(false);
       this.initSplitContainer.Panel1.ResumeLayout(false);
@@ -224 +251 @@
     #endregion
 
-    private HeuristicLab.Core.OperatorLibraryEditor operatorLibraryEditor;
     private System.Windows.Forms.TabControl tabControl;
-    private System.Windows.Forms.TabPage operatorLibraryTabPage;
+    private System.Windows.Forms.TabPage functionsTabPage;
     private System.Windows.Forms.TabPage initializationTabPage;
     private System.Windows.Forms.TabPage mutationTabPage;
@@ -235 +261 @@
     private System.Windows.Forms.ListView initListView;
     private System.Windows.Forms.ListView mutationListView;
+    private System.Windows.Forms.Button removeButton;
+    private System.Windows.Forms.Button addButton;
+    private System.Windows.Forms.ListView functionsListView;
   }
 }

branches/GP-Refactoring-713/sources/HeuristicLab.GP/3.3/FunctionLibraryEditor.cs

@@ -22 +22 @@
 using System;
 using System.Collections.Generic;
-using System.ComponentModel;
-using System.Drawing;
-using System.Data;
 using System.Linq;
-using System.Text;
 using System.Windows.Forms;
 using HeuristicLab.Core;
-using System.Diagnostics;
-using HeuristicLab.Data;
-using HeuristicLab.Operators;
-using HeuristicLab.Random;
 using HeuristicLab.GP.Interfaces;
 
 namespace HeuristicLab.GP {
   public partial class FunctionLibraryEditor : EditorBase {
+    private ChooseItemDialog chooseFunctionDialog;
     public FunctionLibrary FunctionLibrary {
       get { return (FunctionLibrary)Item; }
@@ -46 +39 @@
       InitializeComponent();
       FunctionLibrary = library;
-
-      mutationVariableView.Enabled = false;
-      initVariableView.Enabled = false;
-
-      foreach (IFunction fun in library.Functions) {
-        if (fun.Manipulator != null) {
-          ListViewItem item = new ListViewItem();
-          item.Text = fun.Name;
-          item.Name = fun.Name;
-          item.Tag = fun;
-          mutationListView.Items.Add(item);
-        }
-        if (fun.Initializer != null) {
-          ListViewItem item = new ListViewItem();
-          item.Name = fun.Name;
-          item.Text = fun.Name;
-          item.Tag = fun;
-          initListView.Items.Add(item);
-        }
-      }
     }
 
@@ -75 +48 @@
     protected override void UpdateControls() {
       base.UpdateControls();
+      foreach (IFunction fun in FunctionLibrary.Functions) {
+        if (fun.Manipulator != null) {
+          mutationListView.Items.Add(CreateListViewItem(fun));
+        }
+        if (fun.Initializer != null) {
+          initListView.Items.Add(CreateListViewItem(fun));
+        }
+      }
     }
 
-    //private void GPOperatorLibraryView_OperatorAdded(object sender, EventArgs e) {
-    //  IOperator op = ((OperatorEventArgs)e).op;
-    //  if(op.GetVariable(FunctionBase.MANIPULATION) != null) {
-    //    ListViewItem operatorMutationItem = new ListViewItem();
-    //    operatorMutationItem.Name = op.Name;
-    //    operatorMutationItem.Text = op.Name;
-    //    operatorMutationItem.Tag = op;
-    //    mutationListView.Items.Add(operatorMutationItem);
-    //  }
-
-    //  if(op.GetVariable(FunctionBase.INITIALIZATION) != null) {
-    //    ListViewItem operatorInitItem = new ListViewItem();
-    //    operatorInitItem.Name = op.Name;
-    //    operatorInitItem.Text = op.Name;
-    //    operatorInitItem.Tag = op;
-    //    initListView.Items.Add(operatorInitItem);
-    //  }
-
-    //  op.NameChanged += new EventHandler(op_NameChanged);
-    //  Refresh();
-    //}
-
-    //private void op_NameChanged(object sender, EventArgs e) {
-    //  IOperator srcOp = (IOperator)sender;
-    //  foreach(ListViewItem item in mutationListView.Items) {
-    //    if(item.Tag == srcOp) {
-    //      item.Name = srcOp.Name;
-    //      item.Text = srcOp.Name;
-    //      break;
-    //    }
-    //  }
-    //  foreach(ListViewItem item in initListView.Items) {
-    //    if(item.Tag == srcOp) {
-    //      item.Name = srcOp.Name;
-    //      item.Text = srcOp.Name;
-    //      break;
-    //    }
-    //  }
-    //}
-
-
-    //private void GPOperatorGroup_OperatorRemoved(object sender, EventArgs e) {
-    //  IOperator op = ((OperatorEventArgs)e).op;
-
-    //  foreach(ListViewItem item in mutationListView.Items) {
-    //    if(item.Tag == op) {
-    //      mutationListView.Items.Remove(item);
-    //      break;
-    //    }
-    //  }
-
-    //  foreach(ListViewItem item in initListView.Items) {
-    //    if(item.Tag == op) {
-    //      initListView.Items.Remove(item);
-    //      break;
-    //    }
-    //  }
-    //}
-
     private void mutationListView_SelectedIndexChanged(object sender, EventArgs e) {
-      //if(mutationListView.SelectedItems.Count>0 && mutationListView.SelectedItems[0].Tag != null) {
-      //  IVariable variable = ((IFunction)mutationListView.SelectedItems[0].Tag).Manipulator;
-      //  mutationVariableView.Enabled = true;
-      //  mutationVariableView.Variable = variable;
-      //} else {
-      //  mutationVariableView.Enabled = false;
-      //}
+      if (mutationListView.SelectedItems.Count > 0 && mutationListView.SelectedItems[0].Tag != null) {
+        IOperator manipulator = ((IFunction)mutationListView.SelectedItems[0].Tag).Manipulator;
+        mutationVariableView.Enabled = true;
+        mutationVariableView.Variable = new Variable("Manipulator", manipulator);
+      } else {
+        mutationVariableView.Enabled = false;
+      }
     }
 
     private void initListView_SelectedIndexChanged(object sender, EventArgs e) {
-      //if(initListView.SelectedItems.Count>0 && initListView.SelectedItems[0].Tag != null) {
-      //  IVariable variable = ((IFunction)initListView.SelectedItems[0].Tag).Initializer;
-      //  initVariableView.Enabled = true;
-      //  initVariableView.Variable = variable;
-      //} else {
-      //  initVariableView.Enabled = false;
-      //}
+      if (initListView.SelectedItems.Count > 0 && initListView.SelectedItems[0].Tag != null) {
+        IOperator initializer = ((IFunction)initListView.SelectedItems[0].Tag).Initializer;
+        initVariableView.Enabled = true;
+        initVariableView.Variable = new Variable("Initializer", initializer);
+      } else {
+        initVariableView.Enabled = false;
+      }
+    }
+
+    private void addButton_Click(object sender, EventArgs e) {
+      if (chooseFunctionDialog == null) chooseFunctionDialog = new ChooseItemDialog(typeof(IFunction));
+      if (chooseFunctionDialog.ShowDialog(this) == DialogResult.OK) {
+        FunctionLibrary.AddFunction((IFunction)chooseFunctionDialog.Item);
+        functionsListView.Items.Add(CreateListViewItem((IFunction)chooseFunctionDialog.Item));
+        functionsListView.Sort();
+      }
+    }
+
+    private void removeButton_Click(object sender, EventArgs e) {
+      // delete from the end of the list
+      IEnumerable<int> removeIndices = functionsListView.SelectedIndices.OfType<int>().OrderBy(x => 1.0 / x);
+      foreach (int selectedIndex in removeIndices) {
+        FunctionLibrary.RemoveFunction((IFunction)functionsListView.Items[selectedIndex].Tag);
+        functionsListView.Items.RemoveAt(selectedIndex);
+      }
+    }
+
+    private void functionsListView_SelectedIndexChanged(object sender, EventArgs e) {
+      removeButton.Enabled = functionsListView.SelectedIndices.Count > 0;
+    }
+
+    private ListViewItem CreateListViewItem(IFunction function) {
+      ListViewItem item = new ListViewItem();
+      item.Name = function.Name;
+      item.Text = function.Name;
+      item.Tag = function;
+      return item;
     }
   }

branches/GP-Refactoring-713/sources/HeuristicLab.GP/3.3/FunctionTreeView.Designer.cs

@@ -36 +36 @@
         components.Dispose();
       }
-      if(selectedVariable != null) {
-        selectedVariable.Value.Changed -= new EventHandler(selectedVariable_ValueChanged);
-      }
       base.Dispose(disposing);
     }
@@ -49 +46 @@
     /// </summary>
     private void InitializeComponent() {
-      this.components = new System.ComponentModel.Container();
+      this.treeNodeContextMenu = new System.Windows.Forms.ContextMenu();
       this.funTreeView = new System.Windows.Forms.TreeView();
-      this.splitContainer = new System.Windows.Forms.SplitContainer();
-      this.variablesGroupBox = new System.Windows.Forms.GroupBox();
-      this.variablesSplitContainer = new System.Windows.Forms.SplitContainer();
-      this.variablesListBox = new System.Windows.Forms.ListBox();
-      this.label1 = new System.Windows.Forms.Label();
-      this.templateTextBox = new System.Windows.Forms.TextBox();
-      this.editButton = new System.Windows.Forms.Button();
-      this.treeNodeContextMenu = new System.Windows.Forms.ContextMenu();
-      this.splitContainer.Panel1.SuspendLayout();
-      this.splitContainer.Panel2.SuspendLayout();
-      this.splitContainer.SuspendLayout();
-      this.variablesGroupBox.SuspendLayout();
-      this.variablesSplitContainer.Panel1.SuspendLayout();
-      this.variablesSplitContainer.SuspendLayout();
       this.SuspendLayout();
       // 
@@ -73 +56 @@
       this.funTreeView.Location = new System.Drawing.Point(0, 0);
       this.funTreeView.Name = "funTreeView";
-      this.funTreeView.Size = new System.Drawing.Size(182, 532);
+      this.funTreeView.Size = new System.Drawing.Size(432, 514);
       this.funTreeView.TabIndex = 0;
       this.funTreeView.MouseUp += new System.Windows.Forms.MouseEventHandler(this.funTreeView_MouseUp);
-      this.funTreeView.AfterSelect += new System.Windows.Forms.TreeViewEventHandler(this.functionTreeView_AfterSelect);
-      // 
-      // splitContainer
-      // 
-      this.splitContainer.Dock = System.Windows.Forms.DockStyle.Fill;
-      this.splitContainer.Location = new System.Drawing.Point(0, 0);
-      this.splitContainer.Name = "splitContainer";
-      // 
-      // splitContainer.Panel1
-      // 
-      this.splitContainer.Panel1.Controls.Add(this.funTreeView);
-      // 
-      // splitContainer.Panel2
-      // 
-      this.splitContainer.Panel2.Controls.Add(this.variablesGroupBox);
-      this.splitContainer.Panel2.Controls.Add(this.label1);
-      this.splitContainer.Panel2.Controls.Add(this.templateTextBox);
-      this.splitContainer.Panel2.Controls.Add(this.editButton);
-      this.splitContainer.Size = new System.Drawing.Size(735, 532);
-      this.splitContainer.SplitterDistance = 182;
-      this.splitContainer.TabIndex = 1;
-      // 
-      // variablesGroupBox
-      // 
-      this.variablesGroupBox.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.variablesGroupBox.Controls.Add(this.variablesSplitContainer);
-      this.variablesGroupBox.Location = new System.Drawing.Point(3, 31);
-      this.variablesGroupBox.Name = "variablesGroupBox";
-      this.variablesGroupBox.Size = new System.Drawing.Size(543, 498);
-      this.variablesGroupBox.TabIndex = 5;
-      this.variablesGroupBox.TabStop = false;
-      this.variablesGroupBox.Text = "Local variables";
-      // 
-      // variablesSplitContainer
-      // 
-      this.variablesSplitContainer.Dock = System.Windows.Forms.DockStyle.Fill;
-      this.variablesSplitContainer.Location = new System.Drawing.Point(3, 16);
-      this.variablesSplitContainer.Name = "variablesSplitContainer";
-      // 
-      // variablesSplitContainer.Panel1
-      // 
-      this.variablesSplitContainer.Panel1.Controls.Add(this.variablesListBox);
-      this.variablesSplitContainer.Size = new System.Drawing.Size(537, 479);
-      this.variablesSplitContainer.SplitterDistance = 179;
-      this.variablesSplitContainer.TabIndex = 0;
-      // 
-      // variablesListBox
-      // 
-      this.variablesListBox.Dock = System.Windows.Forms.DockStyle.Fill;
-      this.variablesListBox.FormattingEnabled = true;
-      this.variablesListBox.Location = new System.Drawing.Point(0, 0);
-      this.variablesListBox.Name = "variablesListBox";
-      this.variablesListBox.Size = new System.Drawing.Size(179, 472);
-      this.variablesListBox.TabIndex = 0;
-      this.variablesListBox.SelectedIndexChanged += new System.EventHandler(this.variablesListBox_SelectedIndexChanged);
-      // 
-      // label1
-      // 
-      this.label1.AutoSize = true;
-      this.label1.Location = new System.Drawing.Point(3, 10);
-      this.label1.Name = "label1";
-      this.label1.Size = new System.Drawing.Size(96, 13);
-      this.label1.TabIndex = 3;
-      this.label1.Text = "Function definition:";
-      // 
-      // templateTextBox
-      // 
-      this.templateTextBox.Location = new System.Drawing.Point(105, 7);
-      this.templateTextBox.Name = "templateTextBox";
-      this.templateTextBox.ReadOnly = true;
-      this.templateTextBox.Size = new System.Drawing.Size(190, 20);
-      this.templateTextBox.TabIndex = 2;
-      // 
-      // editButton
-      // 
-      this.editButton.Enabled = false;
-      this.editButton.Location = new System.Drawing.Point(301, 5);
-      this.editButton.Name = "editButton";
-      this.editButton.Size = new System.Drawing.Size(49, 23);
-      this.editButton.TabIndex = 1;
-      this.editButton.Text = "Edit...";
-      this.editButton.UseVisualStyleBackColor = true;
-      this.editButton.Click += new System.EventHandler(this.editButton_Click);
-      // 
-      // treeNodeContextMenu
-      // 
-      this.treeNodeContextMenu.Name = "treeNodeContextMenu";
       // 
       // FunctionTreeView
@@ -170 +64 @@
       this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
       this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-      this.Controls.Add(this.splitContainer);
+      this.Controls.Add(this.funTreeView);
       this.Name = "FunctionTreeView";
-      this.Size = new System.Drawing.Size(735, 532);
-      this.splitContainer.Panel1.ResumeLayout(false);
-      this.splitContainer.Panel2.ResumeLayout(false);
-      this.splitContainer.Panel2.PerformLayout();
-      this.splitContainer.ResumeLayout(false);
-      this.variablesGroupBox.ResumeLayout(false);
-      this.variablesSplitContainer.Panel1.ResumeLayout(false);
-      this.variablesSplitContainer.ResumeLayout(false);
+      this.Size = new System.Drawing.Size(432, 514);
       this.ResumeLayout(false);
 
@@ -186 +73 @@
     #endregion
 
+    private System.Windows.Forms.ContextMenu treeNodeContextMenu;
     private System.Windows.Forms.TreeView funTreeView;
-    private System.Windows.Forms.SplitContainer splitContainer;
-    private System.Windows.Forms.TextBox templateTextBox;
-    private System.Windows.Forms.Button editButton;
-    private System.Windows.Forms.GroupBox variablesGroupBox;
-    private System.Windows.Forms.SplitContainer variablesSplitContainer;
-    private System.Windows.Forms.ListBox variablesListBox;
-    private System.Windows.Forms.Label label1;
-    private System.Windows.Forms.ContextMenu treeNodeContextMenu;
   }
 }

branches/GP-Refactoring-713/sources/HeuristicLab.GP/3.3/FunctionTreeView.cs

@@ -21 +21 @@
 
 using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Drawing;
-using System.Data;
-using System.Linq;
-using System.Text;
 using System.Windows.Forms;
 using HeuristicLab.Core;
 using HeuristicLab.PluginInfrastructure;
-using HeuristicLab.Data;
 using HeuristicLab.GP.Interfaces;
 
@@ -36 +29 @@
   public partial class FunctionTreeView : ViewBase {
     private IFunctionTree functionTree;
-
     private IFunctionTree selectedBranch;
-    private IVariable selectedVariable;
     private IFunctionTreeNameGenerator nameGenerator;
     private IFunctionTreeNameGenerator[] allNameGenerators;
@@ -130 +121 @@
     }
 
-    private void functionTreeView_AfterSelect(object sender, TreeViewEventArgs e) {
-      variablesListBox.Items.Clear();
-      variablesSplitContainer.Panel2.Controls.Clear();
-      templateTextBox.Clear();
-      editButton.Enabled = false;
-      if (funTreeView.SelectedNode != null && funTreeView.SelectedNode.Tag != null) {
-        IFunctionTree selectedBranch = (IFunctionTree)funTreeView.SelectedNode.Tag;
-//      UpdateVariablesList(selectedBranch);
-        templateTextBox.Text = nameGenerator.GetName(selectedBranch);
-        this.selectedBranch = selectedBranch;
-        editButton.Enabled = true;
-      }
-    }
-
-    //private void UpdateVariablesList(IFunctionTree functionTree) {
-    //  foreach (IVariable variable in functionTree.LocalVariables) {
-    //    variablesListBox.Items.Add(variable.Name);
-    //  }
-    //}
-
-    private void variablesListBox_SelectedIndexChanged(object sender, EventArgs e) {
-      //// in case we had an event-handler registered for a different variable => unregister the event-handler
-      //if (selectedVariable != null) {
-      //  selectedVariable.Value.Changed -= new EventHandler(selectedVariable_ValueChanged);
-      //}
-      //if (variablesListBox.SelectedItem != null) {
-      //  string selectedVariableName = (string)variablesListBox.SelectedItem;
-      //  selectedVariable = selectedBranch.GetLocalVariable(selectedVariableName);
-      //  variablesSplitContainer.Panel2.Controls.Clear();
-      //  Control editor = (Control)selectedVariable.CreateView();
-      //  variablesSplitContainer.Panel2.Controls.Add(editor);
-      //  editor.Dock = DockStyle.Fill;
-      //  // register an event handler that updates the treenode when the value of the variable is changed by the user
-      //  selectedVariable.Value.Changed += new EventHandler(selectedVariable_ValueChanged);
-      //} else {
-      //  variablesSplitContainer.Panel2.Controls.Clear();
-      //}
-    }
-
-    void selectedVariable_ValueChanged(object sender, EventArgs e) {
-      if (funTreeView.SelectedNode != null && funTreeView.SelectedNode.Tag != null) {
-        TreeNode node = funTreeView.SelectedNode;
-        node.Text = nameGenerator.GetName(functionTree);
-      }
-    }
-
-    protected virtual void editButton_Click(object sender, EventArgs e) {
-      PluginManager.ControlManager.ShowControl(selectedBranch.Function.CreateView());
-    }
-
     private void funTreeView_MouseUp(object sender, MouseEventArgs e) {
       if (e.Button == MouseButtons.Right) {

branches/GP-Refactoring-713/sources/HeuristicLab.GP/3.3/FunctionTreeView.resx

@@ -118 +118 @@
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
-  <metadata name="representationContextMenu.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>180, 17</value>
-  </metadata>
   <metadata name="treeNodeContextMenu.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>17, 17</value>

branches/GP-Refactoring-713/sources/HeuristicLab.GP/3.3/HeuristicLab.GP-3.3.csproj

@@ -100 +100 @@
       <DependentUpon>FunctionTreeView.cs</DependentUpon>
     </Compile>
-    <Compile Include="FunView.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
-    <Compile Include="FunView.Designer.cs">
-      <DependentUpon>FunView.cs</DependentUpon>
-    </Compile>
     <Compile Include="GeneticProgrammingModel.cs" />
-    <Compile Include="Initialization\ProbabilisticTreeCreator.cs" />
-    <Compile Include="Initialization\RampedTreeCreator.cs" />
-    <Compile Include="Manipulation\GPManipulatorBase.cs" />
-    <Compile Include="TrainingWindowSlider.cs" />
     <Compile Include="DefaultFunctionTreeNameGenerator.cs" />
-    <Compile Include="EqualiserController.cs" />
-    <Compile Include="Logging\TreeArityAnalyser.cs" />
-    <Compile Include="OffspringEqualiser.cs" />
-    <Compile Include="Recombination\SizeConstrictedGPCrossoverBase.cs" />
-    <Compile Include="Recombination\GPCrossoverBase.cs" />
-    <Compile Include="Recombination\UniformCrossover.cs" />
     <Compile Include="UnknownFunctionException.cs" />
     <Compile Include="HeuristicLabGPPlugin.cs" />
-    <Compile Include="Manipulation\ChangeNodeTypeManipulation.cs" />
-    <Compile Include="Manipulation\CutOutNodeManipulation.cs" />
-    <Compile Include="Manipulation\DeleteSubTreeManipulation.cs" />
-    <Compile Include="Manipulation\FullTreeShaker.cs" />
-    <Compile Include="Manipulation\OnePointShaker.cs" />
-    <Compile Include="Manipulation\SubstituteSubTreeManipulation.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="Recombination\LangdonHomologousCrossOver.cs" />
-    <Compile Include="Recombination\OnePointCrossOver.cs" />
-    <Compile Include="Recombination\SizeFairCrossOver.cs" />
-    <Compile Include="Recombination\StandardCrossOver.cs" />
     <Compile Include="TreeGardener.cs" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\HeuristicLab.Constraints\3.2\HeuristicLab.Constraints-3.2.csproj">
-      <Project>{FCD62C6F-4793-4593-AE9A-0BDCA256EE99}</Project>
-      <Name>HeuristicLab.Constraints-3.2</Name>
-    </ProjectReference>
     <ProjectReference Include="..\..\HeuristicLab.Core\3.2\HeuristicLab.Core-3.2.csproj">
       <Project>{F43B59AB-2B8C-4570-BC1E-15592086517C}</Project>
       <Name>HeuristicLab.Core-3.2</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\HeuristicLab.Data\3.2\HeuristicLab.Data-3.2.csproj">
-      <Project>{F473D9AF-3F09-4296-9F28-3C65118DAFFA}</Project>
-      <Name>HeuristicLab.Data-3.2</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\HeuristicLab.Evolutionary\3.2\HeuristicLab.Evolutionary-3.2.csproj">
-      <Project>{F5614C53-153C-4A37-A608-121E1C087F07}</Project>
-      <Name>HeuristicLab.Evolutionary-3.2</Name>
-    </ProjectReference>
     <ProjectReference Include="..\..\HeuristicLab.GP.Interfaces\3.3\HeuristicLab.GP.Interfaces-3.3.csproj">
       <Project>{924B6BEA-9A99-40FE-9334-5C01E8D540EC}</Project>
       <Name>HeuristicLab.GP.Interfaces-3.3</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\HeuristicLab.Operators\3.2\HeuristicLab.Operators-3.2.csproj">
-      <Project>{A9983BA2-B3B2-475E-8E2C-62050B71D1C5}</Project>
-      <Name>HeuristicLab.Operators-3.2</Name>
     </ProjectReference>
     <ProjectReference Include="..\..\HeuristicLab.PluginInfrastructure\HeuristicLab.PluginInfrastructure.csproj">
@@ -165 +123 @@
       <Project>{47019A74-F7F7-482E-83AA-D3F4F777E879}</Project>
       <Name>HeuristicLab.Random-3.2</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\HeuristicLab.Selection\3.2\HeuristicLab.Selection-3.2.csproj">
-      <Project>{F7CF0571-25CB-43D5-8443-0843A1E2861A}</Project>
-      <Name>HeuristicLab.Selection-3.2</Name>
     </ProjectReference>
   </ItemGroup>

branches/GP-Refactoring-713/sources/HeuristicLab.GP/3.3/HeuristicLabGPPlugin.cs

@@ -29 +29 @@
   [PluginFile(Filename = "HeuristicLab.GP-3.3.dll", Filetype = PluginFileType.Assembly)]
   [Dependency(Dependency = "HeuristicLab.GP.Interfaces-3.3")]
-  [Dependency(Dependency = "HeuristicLab.Constraints-3.2")]
-  [Dependency(Dependency = "HeuristicLab.Core-3.2")]
-  [Dependency(Dependency = "HeuristicLab.Data-3.2")]
-  [Dependency(Dependency = "HeuristicLab.Evolutionary-3.2")]
-  [Dependency(Dependency = "HeuristicLab.Operators-3.2")]
   [Dependency(Dependency = "HeuristicLab.Random-3.2")]
-  [Dependency(Dependency = "HeuristicLab.Selection-3.2")]
   public class HeuristicLabGPPlugin : PluginBase {
   }

branches/GP-Refactoring-713/sources/HeuristicLab.GP/3.3/TreeGardener.cs

@@ -22 +22 @@
 using System;
 using System.Collections.Generic;
-using System.Text;
 using HeuristicLab.Core;
-using HeuristicLab.Constraints;
-using System.Diagnostics;
-using HeuristicLab.Data;
 using System.Linq;
-using HeuristicLab.Random;
-using HeuristicLab.Operators;
 using System.Collections;
-using HeuristicLab.Selection;
 using HeuristicLab.GP.Interfaces;
 
 namespace HeuristicLab.GP {
-  internal class TreeGardener {
+  public class TreeGardener {
     private IRandom random;
     private FunctionLibrary funLibrary;
@@ -41 +34 @@
 
     private List<IFunction> terminals;
-    internal IList<IFunction> Terminals {
+    public IList<IFunction> Terminals {
       get { return terminals; }
     }
 
     private List<IFunction> allFunctions;
-    internal IList<IFunction> AllFunctions {
+    public IList<IFunction> AllFunctions {
       get { return allFunctions; }
     }
 
     #region constructors
-    internal TreeGardener(IRandom random, FunctionLibrary funLibrary) {
+    public TreeGardener(IRandom random, FunctionLibrary funLibrary) {
       this.random = random;
       this.funLibrary = funLibrary;
@@ -78 +71 @@
     /// <param name="maxTreeHeight">Maximal height of the tree.</param>
     /// <returns></returns>
-    internal IFunctionTree CreateBalancedRandomTree(int maxTreeSize, int maxTreeHeight) {
+    public IFunctionTree CreateBalancedRandomTree(int maxTreeSize, int maxTreeHeight) {
       IFunction rootFunction = GetRandomRoot(maxTreeSize, maxTreeHeight);
       IFunctionTree tree = MakeBalancedTree(rootFunction, maxTreeHeight - 1);
@@ -91 +84 @@
     /// <param name="maxTreeHeight">Maximal height of the tree.</param>
     /// <returns></returns>
-    internal IFunctionTree CreateUnbalancedRandomTree(int maxTreeSize, int maxTreeHeight) {
+    public IFunctionTree CreateUnbalancedRandomTree(int maxTreeSize, int maxTreeHeight) {
       IFunction rootFunction = GetRandomRoot(maxTreeSize, maxTreeHeight);
       IFunctionTree tree = MakeUnbalancedTree(rootFunction, maxTreeHeight - 1);
@@ -177 +170 @@
     /// <param name="maxTreeHeight">Maximal height of the tree.</param>
     /// <returns>New random unbalanced tree</returns>
-    internal IFunctionTree CreateRandomTree(ICollection<IFunction> allowedFunctions, int maxTreeSize, int maxTreeHeight) {
+    public IFunctionTree CreateRandomTree(ICollection<IFunction> allowedFunctions, int maxTreeSize, int maxTreeHeight) {
       // get the minimal needed height based on allowed functions and extend the max-height if necessary
       int minTreeHeight = allowedFunctions.Select(f => f.MinTreeHeight).Min();
@@ -201 +194 @@
       return root;
     }
-
-    internal static CompositeOperation CreateInitializationOperation(ICollection<IFunctionTree> trees, IScope scope) {
-      // create a backup of sub scopes to restore after initialization
-      Scope backupScope = new Scope("backup");
-      foreach (Scope subScope in scope.SubScopes) {
-        backupScope.AddSubScope(subScope);
-      }
-
-      CompositeOperation initializationOperation = new CompositeOperation();
-      Scope tempScope = new Scope("Temp. initialization scope");
-
-      var parametricTrees = trees.Where(t => t.HasLocalParameters);
-      foreach(IFunctionTree tree in parametricTrees) {
-        initializationOperation.AddOperation(tree.CreateInitOperation(tempScope));
-      }
-      scope.AddSubScope(tempScope);
-      scope.AddSubScope(backupScope);
-      // add an operation to remove the temporary scopes        
-      initializationOperation.AddOperation(new AtomicOperation(new RightReducer(), scope));
-      return initializationOperation;
-    }
     #endregion
 
     #region tree information gathering
-    internal IFunctionTree GetRandomParentNode(IFunctionTree tree) {
+    public IFunctionTree GetRandomParentNode(IFunctionTree tree) {
       List<IFunctionTree> parentNodes = new List<IFunctionTree>();
 
@@ -240 +212 @@
     }
 
-    internal static ICollection<IFunctionTree> GetAllSubTrees(IFunctionTree root) {
+    public static ICollection<IFunctionTree> GetAllSubTrees(IFunctionTree root) {
       List<IFunctionTree> allTrees = new List<IFunctionTree>();
       TreeForEach(root, t => { allTrees.Add(t); });
@@ -256 +228 @@
     /// <param name="branch">branch that is searched in the tree</param>
     /// <returns></returns>
-    internal int GetBranchLevel(IFunctionTree tree, IFunctionTree branch) {
+    public int GetBranchLevel(IFunctionTree tree, IFunctionTree branch) {
       return GetBranchLevelHelper(tree, branch, 1);
     }
@@ -272 +244 @@
     }
 
-    internal bool IsValidTree(IFunctionTree tree) {
+    public bool IsValidTree(IFunctionTree tree) {
       for(int i = 0; i < tree.SubTrees.Count; i++) {
         if(!tree.Function.GetAllowedSubFunctions(i).Contains(tree.SubTrees[i].Function)) return false;
@@ -286 +258 @@
 
     // returns a random branch from the specified level in the tree
-    internal IFunctionTree GetRandomBranch(IFunctionTree tree, int level) {
+    public IFunctionTree GetRandomBranch(IFunctionTree tree, int level) {
       if(level == 0) return tree;
       List<IFunctionTree> branches = new List<IFunctionTree>();
@@ -359 +331 @@
       return assignments == children.Count - 1;
     }
-    internal IList<IFunction> GetAllowedParents(IFunction child, int childIndex) {
+    public IList<IFunction> GetAllowedParents(IFunction child, int childIndex) {
       List<IFunction> parents = new List<IFunction>();
       foreach(IFunction function in functions) {
@@ -369 +341 @@
       return parents;
     }
-    internal static bool IsTerminal(IFunction f) {
+    public static bool IsTerminal(IFunction f) {
       return f.MinSubTrees == 0 && f.MaxSubTrees == 0;
     }
-    internal ICollection<IFunction> GetAllowedSubFunctions(IFunction f, int index) {
+    public ICollection<IFunction> GetAllowedSubFunctions(IFunction f, int index) {
       if(f == null) {
         return allFunctions;