Changeset 277

Timestamp:

05/30/08 12:42:12 (16 years ago)

Author:

gkronber

Message:

merged changesets r154 r160 r162 from trunk into the stable branch

Location:

branches/3.0/sources/HeuristicLab.StructureIdentification

Files:

• Manipulation/ChangeNodeTypeManipulation.cs (modified) (1 diff)
• StructIdProblemInjector.cs (modified) (1 diff)
• StructIdProblemInjectorView.Designer.cs (modified) (3 diffs)

branches/3.0/sources/HeuristicLab.StructureIdentification/Manipulation/ChangeNodeTypeManipulation.cs

@@ -32 +32 @@
 namespace HeuristicLab.StructureIdentification {
   public class ChangeNodeTypeManipulation : OperatorBase {
+
+    public override string Description {
+      get {
+        return @"This manipulation operator selects a random tree-node and changes the function type.
+If this leads to a constraint-violation (wrong number or type of sub-trees) the sub-trees are repaired
+resulting in a valid tree again.";
+      }
+    }
+
     public ChangeNodeTypeManipulation()
       : base() {

branches/3.0/sources/HeuristicLab.StructureIdentification/StructIdProblemInjector.cs

@@ -37 +37 @@
     public StructIdProblemInjector()
       : base() {
-      AddVariableInfo(new VariableInfo("Maximization", "Set to false as structure identification is a minimization problem", typeof(BoolData), VariableKind.New));
+      AddVariableInfo(new VariableInfo("Maximization", "Set to false as default (for MSE)", typeof(BoolData), VariableKind.New));
       AddVariableInfo(new VariableInfo("Dataset", "Dataset", typeof(Dataset), VariableKind.New));
       AddVariable(new Variable("Dataset", new Dataset()));

branches/3.0/sources/HeuristicLab.StructureIdentification/StructIdProblemInjectorView.Designer.cs

@@ -51 +51 @@
       this.tabControl = new System.Windows.Forms.TabControl();
       this.dataTabPage = new System.Windows.Forms.TabPage();
+      this.variablesLabel = new System.Windows.Forms.Label();
+      this.variablesTextBox = new System.Windows.Forms.TextBox();
+      this.samplesLabel = new System.Windows.Forms.Label();
+      this.samplesTextBox = new System.Windows.Forms.TextBox();
       this.variableInfosTabPage = new System.Windows.Forms.TabPage();
       this.operatorBaseVariableInfosView = new HeuristicLab.Core.OperatorBaseVariableInfosView();
       this.descriptionTabPage = new System.Windows.Forms.TabPage();
       this.operatorBaseDescriptionView = new HeuristicLab.Core.OperatorBaseDescriptionView();
-      this.samplesLabel = new System.Windows.Forms.Label();
-      this.samplesTextBox = new System.Windows.Forms.TextBox();
-      this.variablesLabel = new System.Windows.Forms.Label();
-      this.variablesTextBox = new System.Windows.Forms.TextBox();
       this.tabControl.SuspendLayout();
       this.dataTabPage.SuspendLayout();
@@ -128 +128 @@
       this.dataTabPage.Size = new System.Drawing.Size(268, 158);
       this.dataTabPage.TabIndex = 0;
-      this.dataTabPage.Text = "TSP Data";
+      this.dataTabPage.Text = "Data";
       this.dataTabPage.UseVisualStyleBackColor = true;
+      // 
+      // variablesLabel
+      // 
+      this.variablesLabel.Anchor = System.Windows.Forms.AnchorStyles.Left;
+      this.variablesLabel.AutoSize = true;
+      this.variablesLabel.Location = new System.Drawing.Point(6, 61);
+      this.variablesLabel.Name = "variablesLabel";
+      this.variablesLabel.Size = new System.Drawing.Size(53, 13);
+      this.variablesLabel.TabIndex = 9;
+      this.variablesLabel.Text = "Variables:";
+      // 
+      // variablesTextBox
+      // 
+      this.variablesTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
+      this.variablesTextBox.Location = new System.Drawing.Point(62, 58);
+      this.variablesTextBox.Name = "variablesTextBox";
+      this.variablesTextBox.ReadOnly = true;
+      this.variablesTextBox.Size = new System.Drawing.Size(81, 20);
+      this.variablesTextBox.TabIndex = 10;
+      // 
+      // samplesLabel
+      // 
+      this.samplesLabel.Anchor = System.Windows.Forms.AnchorStyles.Left;
+      this.samplesLabel.AutoSize = true;
+      this.samplesLabel.Location = new System.Drawing.Point(6, 35);
+      this.samplesLabel.Name = "samplesLabel";
+      this.samplesLabel.Size = new System.Drawing.Size(50, 13);
+      this.samplesLabel.TabIndex = 7;
+      this.samplesLabel.Text = "Samples:";
+      // 
+      // samplesTextBox
+      // 
+      this.samplesTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
+      this.samplesTextBox.Location = new System.Drawing.Point(62, 32);
+      this.samplesTextBox.Name = "samplesTextBox";
+      this.samplesTextBox.ReadOnly = true;
+      this.samplesTextBox.Size = new System.Drawing.Size(81, 20);
+      this.samplesTextBox.TabIndex = 8;
       // 
       // variableInfosTabPage
@@ -172 +210 @@
       this.operatorBaseDescriptionView.Size = new System.Drawing.Size(262, 152);
       this.operatorBaseDescriptionView.TabIndex = 0;
-      // 
-      // samplesLabel
-      // 
-      this.samplesLabel.Anchor = System.Windows.Forms.AnchorStyles.Left;
-      this.samplesLabel.AutoSize = true;
-      this.samplesLabel.Location = new System.Drawing.Point(6, 35);
-      this.samplesLabel.Name = "samplesLabel";
-      this.samplesLabel.Size = new System.Drawing.Size(50, 13);
-      this.samplesLabel.TabIndex = 7;
-      this.samplesLabel.Text = "Samples:";
-      // 
-      // samplesTextBox
-      // 
-      this.samplesTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
-      this.samplesTextBox.Location = new System.Drawing.Point(62, 32);
-      this.samplesTextBox.Name = "samplesTextBox";
-      this.samplesTextBox.ReadOnly = true;
-      this.samplesTextBox.Size = new System.Drawing.Size(81, 20);
-      this.samplesTextBox.TabIndex = 8;
-      // 
-      // variablesLabel
-      // 
-      this.variablesLabel.Anchor = System.Windows.Forms.AnchorStyles.Left;
-      this.variablesLabel.AutoSize = true;
-      this.variablesLabel.Location = new System.Drawing.Point(6, 61);
-      this.variablesLabel.Name = "variablesLabel";
-      this.variablesLabel.Size = new System.Drawing.Size(53, 13);
-      this.variablesLabel.TabIndex = 9;
-      this.variablesLabel.Text = "Variables:";
-      // 
-      // variablesTextBox
-      // 
-      this.variablesTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
-      this.variablesTextBox.Location = new System.Drawing.Point(62, 58);
-      this.variablesTextBox.Name = "variablesTextBox";
-      this.variablesTextBox.ReadOnly = true;
-      this.variablesTextBox.Size = new System.Drawing.Size(81, 20);
-      this.variablesTextBox.TabIndex = 10;
       // 
       // StructIdProblemInjectorView