Changeset 432 for trunk/sources

Timestamp:

08/03/08 23:53:44 (16 years ago)

Author:

gkronber

Message:

• removed the button and methods for manual recalculation of min tree bounds introduced with r423 because it soon won't be needed anymore
• GPOperatorGroup adds event-handlers to SubOperatorTypeConstraints on the operators added to the library to automatically update min tree size and height when any of them is changed.

(ticket #225)

Location:

trunk/sources/HeuristicLab.StructureIdentification

Files:

• GPOperatorGroup.cs (modified) (4 diffs)
• GPOperatorLibrary.cs (modified) (1 diff)
• GPOperatorLibraryEditor.Designer.cs (modified) (4 diffs)
• GPOperatorLibraryEditor.cs (modified) (1 diff)

trunk/sources/HeuristicLab.StructureIdentification/GPOperatorGroup.cs

@@ -32 +32 @@
 namespace HeuristicLab.StructureIdentification {
   public class GPOperatorGroup : OperatorGroup {
-    public GPOperatorGroup()
-      : base() {
-    }
-
-    public override void AddOperator(IOperator op) {
-      base.AddOperator(op);
-
-      var localVariableInfos = op.VariableInfos.Where(f => f.Local);
-
-      if(op.GetVariable(GPOperatorLibrary.MIN_TREE_HEIGHT) == null) {
-        op.AddVariable(new Variable(GPOperatorLibrary.MIN_TREE_HEIGHT, new IntData(-1)));
-      }
-      if(op.GetVariable(GPOperatorLibrary.MIN_TREE_SIZE) == null) {
-        op.AddVariable(new Variable(GPOperatorLibrary.MIN_TREE_SIZE, new IntData(-1)));
-      }
-      if(op.GetVariable(GPOperatorLibrary.TICKETS) == null) {
-        op.AddVariable(new Variable(GPOperatorLibrary.TICKETS, new DoubleData(1.0)));
-      }
-      OnOperatorAdded(op);
-    }
-
-
     private Dictionary<IOperator, int> minTreeHeight = new Dictionary<IOperator, int>();
     private Dictionary<IOperator, int> minTreeSize = new Dictionary<IOperator, int>();
     private SubOperatorsConstraintAnalyser constraintAnalyser = new SubOperatorsConstraintAnalyser();
+
+    public GPOperatorGroup()
+      : base() {
+    }
+
+    public override void AddOperator(IOperator op) {
+      base.AddOperator(op);
+      var localVariableInfos = op.VariableInfos.Where(f => f.Local);
+
+      if(op.GetVariable(GPOperatorLibrary.MIN_TREE_HEIGHT) == null) {
+        op.AddVariable(new Variable(GPOperatorLibrary.MIN_TREE_HEIGHT, new IntData(-1)));
+      }
+      if(op.GetVariable(GPOperatorLibrary.MIN_TREE_SIZE) == null) {
+        op.AddVariable(new Variable(GPOperatorLibrary.MIN_TREE_SIZE, new IntData(-1)));
+      }
+      if(op.GetVariable(GPOperatorLibrary.TICKETS) == null) {
+        op.AddVariable(new Variable(GPOperatorLibrary.TICKETS, new DoubleData(1.0)));
+      }
+      foreach(IConstraint c in op.Constraints) {
+        if(c is SubOperatorTypeConstraint || c is AllSubOperatorsTypeConstraint) c.Changed += new EventHandler(UpdateTreeBounds);
+      }
+      OnOperatorAdded(op);
+    }
+
+    void UpdateTreeBounds(object sender, EventArgs e) {
+      RecalculateMinimalTreeBounds();
+    }
 
     private void RecalculateMinimalTreeBounds() {
@@ -108 +113 @@
     }
 
-
     private int RecalculateMinimalTreeHeight(IOperator op) {
       // check for memoized value
@@ -176 +180 @@
       op.RemoveVariable(GPOperatorLibrary.MIN_TREE_HEIGHT);
       op.RemoveVariable(GPOperatorLibrary.TICKETS);
+      foreach(IConstraint c in op.Constraints) {
+        if(c is SubOperatorTypeConstraint || c is AllSubOperatorsTypeConstraint) c.Changed -= new EventHandler(UpdateTreeBounds);
+      }
       OnOperatorRemoved(op);
     }
@@ -196 +203 @@
       }
     }
-
-    internal void Prepare() {
-      RecalculateMinimalTreeBounds();
-    }
   }
 

trunk/sources/HeuristicLab.StructureIdentification/GPOperatorLibrary.cs

@@ -83 +83 @@
 
     #endregion
-
-    internal void Prepare() {
-      GPOperatorGroup.Prepare();
-    }
   }
 }

trunk/sources/HeuristicLab.StructureIdentification/GPOperatorLibraryEditor.Designer.cs

@@ -56 +56 @@
       this.mutationListView = new System.Windows.Forms.ListView();
       this.mutationVariableView = new HeuristicLab.Core.VariableView();
-      this.preprocessButton = new System.Windows.Forms.Button();
       this.tabControl.SuspendLayout();
       this.operatorLibraryTabPage.SuspendLayout();
@@ -94 +93 @@
       // operatorLibraryTabPage
       // 
-      this.operatorLibraryTabPage.Controls.Add(this.preprocessButton);
       this.operatorLibraryTabPage.Controls.Add(this.operatorLibraryEditor);
       this.operatorLibraryTabPage.Location = new System.Drawing.Point(4, 22);
@@ -202 +200 @@
       this.mutationVariableView.TabIndex = 0;
       this.mutationVariableView.Variable = null;
-      // 
-      // preprocessButton
-      // 
-      this.preprocessButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
-      this.preprocessButton.Location = new System.Drawing.Point(440, 509);
-      this.preprocessButton.Name = "preprocessButton";
-      this.preprocessButton.Size = new System.Drawing.Size(75, 23);
-      this.preprocessButton.TabIndex = 1;
-      this.preprocessButton.Text = "Prepare";
-      this.preprocessButton.UseVisualStyleBackColor = true;
-      this.preprocessButton.Click += new System.EventHandler(this.preprocessButton_Click);
       // 
       // GPOperatorLibraryEditor
@@ -248 +235 @@
     private System.Windows.Forms.ListView initListView;
     private System.Windows.Forms.ListView mutationListView;
-    private System.Windows.Forms.Button preprocessButton;
   }
 }

trunk/sources/HeuristicLab.StructureIdentification/GPOperatorLibraryEditor.cs

@@ -151 +151 @@
       }
     }
-
-    private void preprocessButton_Click(object sender, EventArgs e) {
-      ((GPOperatorLibrary)OperatorLibrary).Prepare();
-    }
   }
 }