Changeset 423

Timestamp:

08/02/08 11:32:52 (16 years ago)

Author:

gkronber

Message:

quick fix for #163 (Changing the FunctionLibrary in a VariableInjector has no effect on the injected FunctionLibrary)

Location:

trunk/sources/HeuristicLab.StructureIdentification

Files:

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

trunk/sources/HeuristicLab.StructureIdentification/GPOperatorGroup.cs

@@ -98 +98 @@
       }
 
-      RecalculateAllowedSuboperators();
-      RecalculateMinimalTreeBounds();
+      //RecalculateAllowedSuboperators();
+      //RecalculateMinimalTreeBounds();
 
       OnOperatorAdded(op);
@@ -291 +291 @@
       op.RemoveVariable(GPOperatorLibrary.ALLOWED_SUBOPERATORS);
       op.RemoveVariable(GPOperatorLibrary.TICKETS);
-
       OnOperatorRemoved(op);
     }
@@ -312 +311 @@
       }
     }
+
+    internal void Prepare() {
+      RecalculateAllowedSuboperators();
+      RecalculateMinimalTreeBounds();
+    }
   }
 

trunk/sources/HeuristicLab.StructureIdentification/GPOperatorLibrary.cs

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

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

@@ -54 +54 @@
       this.mutationTabPage = new System.Windows.Forms.TabPage();
       this.mutationSplitContainer = new System.Windows.Forms.SplitContainer();
+      this.mutationListView = new System.Windows.Forms.ListView();
       this.mutationVariableView = new HeuristicLab.Core.VariableView();
-      this.mutationListView = new System.Windows.Forms.ListView();
+      this.preprocessButton = new System.Windows.Forms.Button();
       this.tabControl.SuspendLayout();
       this.operatorLibraryTabPage.SuspendLayout();
@@ -93 +94 @@
       // operatorLibraryTabPage
       // 
+      this.operatorLibraryTabPage.Controls.Add(this.preprocessButton);
       this.operatorLibraryTabPage.Controls.Add(this.operatorLibraryEditor);
       this.operatorLibraryTabPage.Location = new System.Drawing.Point(4, 22);
@@ -178 +180 @@
       this.mutationSplitContainer.SplitterDistance = 221;
       this.mutationSplitContainer.TabIndex = 0;
-      // 
-      // mutationVariableView
-      // 
-      this.mutationVariableView.Caption = "Variable";
-      this.mutationVariableView.Dock = System.Windows.Forms.DockStyle.Fill;
-      this.mutationVariableView.Location = new System.Drawing.Point(0, 0);
-      this.mutationVariableView.Name = "mutationVariableView";
-      this.mutationVariableView.Size = new System.Drawing.Size(438, 529);
-      this.mutationVariableView.TabIndex = 0;
-      this.mutationVariableView.Variable = null;
       // 
       // mutationListView
@@ -200 +192 @@
       this.mutationListView.View = System.Windows.Forms.View.List;
       this.mutationListView.SelectedIndexChanged += new System.EventHandler(this.mutationListView_SelectedIndexChanged);
+      // 
+      // mutationVariableView
+      // 
+      this.mutationVariableView.Caption = "Variable";
+      this.mutationVariableView.Dock = System.Windows.Forms.DockStyle.Fill;
+      this.mutationVariableView.Location = new System.Drawing.Point(0, 0);
+      this.mutationVariableView.Name = "mutationVariableView";
+      this.mutationVariableView.Size = new System.Drawing.Size(438, 529);
+      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
@@ -235 +248 @@
     private System.Windows.Forms.ListView initListView;
     private System.Windows.Forms.ListView mutationListView;
+    private System.Windows.Forms.Button preprocessButton;
   }
 }

trunk/sources/HeuristicLab.StructureIdentification/GPOperatorLibraryEditor.cs

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