Free cookie consent management tool by TermsFeed Policy Generator

Changeset 7869


Ignore:
Timestamp:
05/22/12 16:48:02 (12 years ago)
Author:
sforsten
Message:

#1821: it is now possible to select variables for the symbol VariableCondition

Location:
trunk/sources
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • trunk/sources/HeuristicLab.Problems.DataAnalysis.Symbolic.Views/3.4/Symbols/VariableConditionView.Designer.cs

    r6819 r7869  
    4646    /// </summary>
    4747    private void InitializeComponent() {
    48       this.thresholdInitializationMuLabel = new System.Windows.Forms.Label();
    49       this.thresholdInitializationMuTextBox = new System.Windows.Forms.TextBox();
    50       this.initializationGroupBox = new System.Windows.Forms.GroupBox();
    51       this.slopeInitializationSigmaLabel = new System.Windows.Forms.Label();
    52       this.slopeInitializationSigmaTextBox = new System.Windows.Forms.TextBox();
    53       this.slopeInitializationMuLabel = new System.Windows.Forms.Label();
    54       this.slopeInitializationMuTextBox = new System.Windows.Forms.TextBox();
    55       this.thresholdInitializationSigmaLabel = new System.Windows.Forms.Label();
    56       this.thresholdInitializationSigmaTextBox = new System.Windows.Forms.TextBox();
    5748      this.mutationGroupBox = new System.Windows.Forms.GroupBox();
    5849      this.slopeChangeSigmaLabel = new System.Windows.Forms.Label();
     
    6455      this.ThresholdChangeMuLabel = new System.Windows.Forms.Label();
    6556      this.thresholdChangeMuTextBox = new System.Windows.Forms.TextBox();
     57      this.tabControl = new System.Windows.Forms.TabControl();
     58      this.variableNamesTabPage = new System.Windows.Forms.TabPage();
     59      this.parametersTabPage = new System.Windows.Forms.TabPage();
     60      this.initializationGroupBox = new System.Windows.Forms.GroupBox();
     61      this.slopeInitializationSigmaLabel = new System.Windows.Forms.Label();
     62      this.slopeInitializationSigmaTextBox = new System.Windows.Forms.TextBox();
     63      this.slopeInitializationMuLabel = new System.Windows.Forms.Label();
     64      this.slopeInitializationMuTextBox = new System.Windows.Forms.TextBox();
     65      this.thresholdInitializationSigmaLabel = new System.Windows.Forms.Label();
     66      this.thresholdInitializationSigmaTextBox = new System.Windows.Forms.TextBox();
     67      this.thresholdInitializationMuLabel = new System.Windows.Forms.Label();
     68      this.thresholdInitializationMuTextBox = new System.Windows.Forms.TextBox();
    6669      ((System.ComponentModel.ISupportInitialize)(this.errorProvider)).BeginInit();
     70      this.mutationGroupBox.SuspendLayout();
     71      this.tabControl.SuspendLayout();
     72      this.parametersTabPage.SuspendLayout();
    6773      this.initializationGroupBox.SuspendLayout();
    68       this.mutationGroupBox.SuspendLayout();
    6974      this.SuspendLayout();
    7075      //
     
    7681      //
    7782      this.errorProvider.SetIconAlignment(this.initialFrequencyTextBox, System.Windows.Forms.ErrorIconAlignment.MiddleLeft);
    78       this.initialFrequencyTextBox.Size = new System.Drawing.Size(233, 20);
     83      this.initialFrequencyTextBox.Size = new System.Drawing.Size(427, 20);
     84      //
     85      // minimumArityLabel
     86      //
     87      this.toolTip.SetToolTip(this.minimumArityLabel, "The minimum arity of the symbol");
     88      //
     89      // maximumArityLabel
     90      //
     91      this.toolTip.SetToolTip(this.maximumArityLabel, "The maximum arity of the symbol");
    7992      //
    8093      // minimumArityTextBox
    8194      //
    8295      this.errorProvider.SetIconAlignment(this.minimumArityTextBox, System.Windows.Forms.ErrorIconAlignment.MiddleLeft);
     96      this.minimumArityTextBox.Size = new System.Drawing.Size(421, 20);
    8397      //
    8498      // maximumArityTextBox
    8599      //
    86100      this.errorProvider.SetIconAlignment(this.maximumArityTextBox, System.Windows.Forms.ErrorIconAlignment.MiddleLeft);
     101      this.maximumArityTextBox.Size = new System.Drawing.Size(421, 20);
    87102      //
    88103      // nameTextBox
     
    90105      this.errorProvider.SetIconAlignment(this.nameTextBox, System.Windows.Forms.ErrorIconAlignment.MiddleLeft);
    91106      this.errorProvider.SetIconPadding(this.nameTextBox, 2);
    92       this.nameTextBox.Size = new System.Drawing.Size(203, 20);
    93       //
    94       // thresholdInitializationMuLabel
    95       //
    96       this.thresholdInitializationMuLabel.AutoSize = true;
    97       this.thresholdInitializationMuLabel.Location = new System.Drawing.Point(6, 18);
    98       this.thresholdInitializationMuLabel.Name = "thresholdInitializationMuLabel";
    99       this.thresholdInitializationMuLabel.Size = new System.Drawing.Size(80, 13);
    100       this.thresholdInitializationMuLabel.TabIndex = 0;
    101       this.thresholdInitializationMuLabel.Text = "Threshold (mu):";
    102       this.toolTip.SetToolTip(this.thresholdInitializationMuLabel, "The mu (mean) parameter of the normal distribution to use for initial weights.");
    103       //
    104       // thresholdInitializationMuTextBox
    105       //
    106       this.thresholdInitializationMuTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
    107             | System.Windows.Forms.AnchorStyles.Right)));
    108       this.thresholdInitializationMuTextBox.Location = new System.Drawing.Point(114, 15);
    109       this.thresholdInitializationMuTextBox.Name = "thresholdInitializationMuTextBox";
    110       this.thresholdInitializationMuTextBox.Size = new System.Drawing.Size(203, 20);
    111       this.thresholdInitializationMuTextBox.TabIndex = 1;
    112       this.toolTip.SetToolTip(this.thresholdInitializationMuTextBox, "The mu (mean) parameter of the normal distribution from which to sample the initi" +
    113         "al thresholds.");
    114       this.thresholdInitializationMuTextBox.TextChanged += new System.EventHandler(this.thresholdMuTextBox_TextChanged);
     107      this.nameTextBox.Size = new System.Drawing.Size(397, 20);
     108      //
     109      // infoLabel
     110      //
     111      this.infoLabel.Location = new System.Drawing.Point(495, 3);
     112      //
     113      // mutationGroupBox
     114      //
     115      this.mutationGroupBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
     116            | System.Windows.Forms.AnchorStyles.Right)));
     117      this.mutationGroupBox.Controls.Add(this.slopeChangeSigmaLabel);
     118      this.mutationGroupBox.Controls.Add(this.slopeChangeSigmaTextBox);
     119      this.mutationGroupBox.Controls.Add(this.slopeChangeMuLabel);
     120      this.mutationGroupBox.Controls.Add(this.slopeChangeMuTextBox);
     121      this.mutationGroupBox.Controls.Add(this.thresholdChangeSigmaLabel);
     122      this.mutationGroupBox.Controls.Add(this.thresholdChangeSigmaTextBox);
     123      this.mutationGroupBox.Controls.Add(this.ThresholdChangeMuLabel);
     124      this.mutationGroupBox.Controls.Add(this.thresholdChangeMuTextBox);
     125      this.mutationGroupBox.Location = new System.Drawing.Point(6, 142);
     126      this.mutationGroupBox.Name = "mutationGroupBox";
     127      this.mutationGroupBox.Size = new System.Drawing.Size(503, 126);
     128      this.mutationGroupBox.TabIndex = 6;
     129      this.mutationGroupBox.TabStop = false;
     130      this.mutationGroupBox.Text = "Mutation";
     131      //
     132      // slopeChangeSigmaLabel
     133      //
     134      this.slopeChangeSigmaLabel.AutoSize = true;
     135      this.slopeChangeSigmaLabel.Location = new System.Drawing.Point(6, 102);
     136      this.slopeChangeSigmaLabel.Name = "slopeChangeSigmaLabel";
     137      this.slopeChangeSigmaLabel.Size = new System.Drawing.Size(112, 13);
     138      this.slopeChangeSigmaLabel.TabIndex = 6;
     139      this.slopeChangeSigmaLabel.Text = "Slope change (sigma):";
     140      this.toolTip.SetToolTip(this.slopeChangeSigmaLabel, "The sigma parameter for the normal distribution to use to sample the change in sl" +
     141        "ope.");
     142      //
     143      // slopeChangeSigmaTextBox
     144      //
     145      this.slopeChangeSigmaTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
     146            | System.Windows.Forms.AnchorStyles.Right)));
     147      this.slopeChangeSigmaTextBox.Location = new System.Drawing.Point(149, 99);
     148      this.slopeChangeSigmaTextBox.Name = "slopeChangeSigmaTextBox";
     149      this.slopeChangeSigmaTextBox.Size = new System.Drawing.Size(345, 20);
     150      this.slopeChangeSigmaTextBox.TabIndex = 7;
     151      this.toolTip.SetToolTip(this.slopeChangeSigmaTextBox, "The sigma parameter for the normal distribution to use to sample the change in sl" +
     152        "ope.");
     153      this.slopeChangeSigmaTextBox.TextChanged += new System.EventHandler(this.slopeChangeSigmaTextBox_TextChanged);
     154      //
     155      // slopeChangeMuLabel
     156      //
     157      this.slopeChangeMuLabel.AutoSize = true;
     158      this.slopeChangeMuLabel.Location = new System.Drawing.Point(6, 76);
     159      this.slopeChangeMuLabel.Name = "slopeChangeMuLabel";
     160      this.slopeChangeMuLabel.Size = new System.Drawing.Size(99, 13);
     161      this.slopeChangeMuLabel.TabIndex = 4;
     162      this.slopeChangeMuLabel.Text = "Slope change (mu):";
     163      this.toolTip.SetToolTip(this.slopeChangeMuLabel, "The nu (mean) parameter for the normal distribution to sample the change in slope" +
     164        ".");
     165      //
     166      // slopeChangeMuTextBox
     167      //
     168      this.slopeChangeMuTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
     169            | System.Windows.Forms.AnchorStyles.Right)));
     170      this.slopeChangeMuTextBox.Location = new System.Drawing.Point(149, 73);
     171      this.slopeChangeMuTextBox.Name = "slopeChangeMuTextBox";
     172      this.slopeChangeMuTextBox.Size = new System.Drawing.Size(345, 20);
     173      this.slopeChangeMuTextBox.TabIndex = 5;
     174      this.toolTip.SetToolTip(this.slopeChangeMuTextBox, "The mu (mean) parameter for the normal distribution to sample the change in slope" +
     175        ".");
     176      this.slopeChangeMuTextBox.TextChanged += new System.EventHandler(this.slopeChangeMuTextBox_TextChanged);
     177      //
     178      // thresholdChangeSigmaLabel
     179      //
     180      this.thresholdChangeSigmaLabel.AutoSize = true;
     181      this.thresholdChangeSigmaLabel.Location = new System.Drawing.Point(6, 44);
     182      this.thresholdChangeSigmaLabel.Name = "thresholdChangeSigmaLabel";
     183      this.thresholdChangeSigmaLabel.Size = new System.Drawing.Size(132, 13);
     184      this.thresholdChangeSigmaLabel.TabIndex = 2;
     185      this.thresholdChangeSigmaLabel.Text = "Threshold change (sigma):";
     186      this.toolTip.SetToolTip(this.thresholdChangeSigmaLabel, "The sigma parameter for the normal distribution to use to sample the change in th" +
     187        "reshold.");
     188      //
     189      // thresholdChangeSigmaTextBox
     190      //
     191      this.thresholdChangeSigmaTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
     192            | System.Windows.Forms.AnchorStyles.Right)));
     193      this.thresholdChangeSigmaTextBox.Location = new System.Drawing.Point(149, 41);
     194      this.thresholdChangeSigmaTextBox.Name = "thresholdChangeSigmaTextBox";
     195      this.thresholdChangeSigmaTextBox.Size = new System.Drawing.Size(345, 20);
     196      this.thresholdChangeSigmaTextBox.TabIndex = 3;
     197      this.toolTip.SetToolTip(this.thresholdChangeSigmaTextBox, "The sigma parameter for the normal distribution to use to sample the change in th" +
     198        "reshold.");
     199      this.thresholdChangeSigmaTextBox.TextChanged += new System.EventHandler(this.thresholdChangeSigmaTextBox_TextChanged);
     200      //
     201      // ThresholdChangeMuLabel
     202      //
     203      this.ThresholdChangeMuLabel.AutoSize = true;
     204      this.ThresholdChangeMuLabel.Location = new System.Drawing.Point(6, 18);
     205      this.ThresholdChangeMuLabel.Name = "ThresholdChangeMuLabel";
     206      this.ThresholdChangeMuLabel.Size = new System.Drawing.Size(119, 13);
     207      this.ThresholdChangeMuLabel.TabIndex = 0;
     208      this.ThresholdChangeMuLabel.Text = "Threshold change (mu):";
     209      this.toolTip.SetToolTip(this.ThresholdChangeMuLabel, "The nu (mean) parameter for the normal distribution to sample the change in thres" +
     210        "hold.");
     211      //
     212      // thresholdChangeMuTextBox
     213      //
     214      this.thresholdChangeMuTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
     215            | System.Windows.Forms.AnchorStyles.Right)));
     216      this.thresholdChangeMuTextBox.Location = new System.Drawing.Point(149, 15);
     217      this.thresholdChangeMuTextBox.Name = "thresholdChangeMuTextBox";
     218      this.thresholdChangeMuTextBox.Size = new System.Drawing.Size(345, 20);
     219      this.thresholdChangeMuTextBox.TabIndex = 1;
     220      this.toolTip.SetToolTip(this.thresholdChangeMuTextBox, "The mu (mean) parameter for the normal distribution to sample the change in thres" +
     221        "hold.");
     222      this.thresholdChangeMuTextBox.TextChanged += new System.EventHandler(this.thresholdChangeMuTextBox_TextChanged);
     223      //
     224      // tabControl
     225      //
     226      this.tabControl.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
     227            | System.Windows.Forms.AnchorStyles.Left)
     228            | System.Windows.Forms.AnchorStyles.Right)));
     229      this.tabControl.Controls.Add(this.variableNamesTabPage);
     230      this.tabControl.Controls.Add(this.parametersTabPage);
     231      this.tabControl.Location = new System.Drawing.Point(0, 127);
     232      this.tabControl.Name = "tabControl";
     233      this.tabControl.SelectedIndex = 0;
     234      this.tabControl.Size = new System.Drawing.Size(520, 299);
     235      this.tabControl.TabIndex = 10;
     236      //
     237      // variableNamesTabPage
     238      //
     239      this.variableNamesTabPage.Location = new System.Drawing.Point(4, 22);
     240      this.variableNamesTabPage.Name = "variableNamesTabPage";
     241      this.variableNamesTabPage.Padding = new System.Windows.Forms.Padding(3);
     242      this.variableNamesTabPage.Size = new System.Drawing.Size(512, 273);
     243      this.variableNamesTabPage.TabIndex = 0;
     244      this.variableNamesTabPage.Text = "Variable Names";
     245      this.variableNamesTabPage.UseVisualStyleBackColor = true;
     246      //
     247      // parametersTabPage
     248      //
     249      this.parametersTabPage.Controls.Add(this.initializationGroupBox);
     250      this.parametersTabPage.Controls.Add(this.mutationGroupBox);
     251      this.parametersTabPage.Location = new System.Drawing.Point(4, 22);
     252      this.parametersTabPage.Name = "parametersTabPage";
     253      this.parametersTabPage.Padding = new System.Windows.Forms.Padding(3);
     254      this.parametersTabPage.Size = new System.Drawing.Size(512, 273);
     255      this.parametersTabPage.TabIndex = 1;
     256      this.parametersTabPage.Text = "Parameters";
     257      this.parametersTabPage.UseVisualStyleBackColor = true;
    115258      //
    116259      // initializationGroupBox
    117260      //
    118       this.initializationGroupBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
     261      this.initializationGroupBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
    119262            | System.Windows.Forms.AnchorStyles.Right)));
    120263      this.initializationGroupBox.Controls.Add(this.slopeInitializationSigmaLabel);
     
    126269      this.initializationGroupBox.Controls.Add(this.thresholdInitializationMuLabel);
    127270      this.initializationGroupBox.Controls.Add(this.thresholdInitializationMuTextBox);
    128       this.initializationGroupBox.Location = new System.Drawing.Point(0, 127);
     271      this.initializationGroupBox.Location = new System.Drawing.Point(6, 6);
    129272      this.initializationGroupBox.Name = "initializationGroupBox";
    130       this.initializationGroupBox.Size = new System.Drawing.Size(326, 127);
    131       this.initializationGroupBox.TabIndex = 5;
     273      this.initializationGroupBox.Size = new System.Drawing.Size(503, 130);
     274      this.initializationGroupBox.TabIndex = 6;
    132275      this.initializationGroupBox.TabStop = false;
    133276      this.initializationGroupBox.Text = "Initialization";
     
    145288      // slopeInitializationSigmaTextBox
    146289      //
    147       this.slopeInitializationSigmaTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
     290      this.slopeInitializationSigmaTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
    148291            | System.Windows.Forms.AnchorStyles.Right)));
    149292      this.slopeInitializationSigmaTextBox.Location = new System.Drawing.Point(114, 102);
    150293      this.slopeInitializationSigmaTextBox.Name = "slopeInitializationSigmaTextBox";
    151       this.slopeInitializationSigmaTextBox.Size = new System.Drawing.Size(203, 20);
     294      this.slopeInitializationSigmaTextBox.Size = new System.Drawing.Size(380, 20);
    152295      this.slopeInitializationSigmaTextBox.TabIndex = 7;
    153296      this.toolTip.SetToolTip(this.slopeInitializationSigmaTextBox, "The sigma parameter for the normal distribution from which to sample the initial " +
    154297        "slopes.");
    155       this.slopeInitializationSigmaTextBox.TextChanged += new System.EventHandler(this.slopeInitializationSigmaTextBox_TextChanged);
    156298      //
    157299      // slopeInitializationMuLabel
     
    167309      // slopeInitializationMuTextBox
    168310      //
    169       this.slopeInitializationMuTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
     311      this.slopeInitializationMuTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
    170312            | System.Windows.Forms.AnchorStyles.Right)));
    171313      this.slopeInitializationMuTextBox.Location = new System.Drawing.Point(114, 76);
    172314      this.slopeInitializationMuTextBox.Name = "slopeInitializationMuTextBox";
    173       this.slopeInitializationMuTextBox.Size = new System.Drawing.Size(203, 20);
     315      this.slopeInitializationMuTextBox.Size = new System.Drawing.Size(380, 20);
    174316      this.slopeInitializationMuTextBox.TabIndex = 5;
    175317      this.toolTip.SetToolTip(this.slopeInitializationMuTextBox, "The mu (mean) parameter of the normal distribution from which to sample the initi" +
    176318        "al slopes.");
    177       this.slopeInitializationMuTextBox.TextChanged += new System.EventHandler(this.slopeInitializationMuTextBox_TextChanged);
    178319      //
    179320      // thresholdInitializationSigmaLabel
     
    189330      // thresholdInitializationSigmaTextBox
    190331      //
    191       this.thresholdInitializationSigmaTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
     332      this.thresholdInitializationSigmaTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
    192333            | System.Windows.Forms.AnchorStyles.Right)));
    193334      this.thresholdInitializationSigmaTextBox.Location = new System.Drawing.Point(114, 41);
    194335      this.thresholdInitializationSigmaTextBox.Name = "thresholdInitializationSigmaTextBox";
    195       this.thresholdInitializationSigmaTextBox.Size = new System.Drawing.Size(203, 20);
     336      this.thresholdInitializationSigmaTextBox.Size = new System.Drawing.Size(380, 20);
    196337      this.thresholdInitializationSigmaTextBox.TabIndex = 3;
    197338      this.toolTip.SetToolTip(this.thresholdInitializationSigmaTextBox, "The sigma parameter for the normal distribution from which to sample the initial " +
    198339        "thresholds.");
    199       this.thresholdInitializationSigmaTextBox.TextChanged += new System.EventHandler(this.thresholdInitializationSigmaTextBox_TextChanged);
    200       //
    201       // mutationGroupBox
    202       //
    203       this.mutationGroupBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
    204             | System.Windows.Forms.AnchorStyles.Right)));
    205       this.mutationGroupBox.Controls.Add(this.slopeChangeSigmaLabel);
    206       this.mutationGroupBox.Controls.Add(this.slopeChangeSigmaTextBox);
    207       this.mutationGroupBox.Controls.Add(this.slopeChangeMuLabel);
    208       this.mutationGroupBox.Controls.Add(this.slopeChangeMuTextBox);
    209       this.mutationGroupBox.Controls.Add(this.thresholdChangeSigmaLabel);
    210       this.mutationGroupBox.Controls.Add(this.thresholdChangeSigmaTextBox);
    211       this.mutationGroupBox.Controls.Add(this.ThresholdChangeMuLabel);
    212       this.mutationGroupBox.Controls.Add(this.thresholdChangeMuTextBox);
    213       this.mutationGroupBox.Location = new System.Drawing.Point(0, 260);
    214       this.mutationGroupBox.Name = "mutationGroupBox";
    215       this.mutationGroupBox.Size = new System.Drawing.Size(326, 127);
    216       this.mutationGroupBox.TabIndex = 6;
    217       this.mutationGroupBox.TabStop = false;
    218       this.mutationGroupBox.Text = "Mutation";
    219       //
    220       // slopeChangeSigmaLabel
    221       //
    222       this.slopeChangeSigmaLabel.AutoSize = true;
    223       this.slopeChangeSigmaLabel.Location = new System.Drawing.Point(6, 102);
    224       this.slopeChangeSigmaLabel.Name = "slopeChangeSigmaLabel";
    225       this.slopeChangeSigmaLabel.Size = new System.Drawing.Size(112, 13);
    226       this.slopeChangeSigmaLabel.TabIndex = 6;
    227       this.slopeChangeSigmaLabel.Text = "Slope change (sigma):";
    228       this.toolTip.SetToolTip(this.slopeChangeSigmaLabel, "The sigma parameter for the normal distribution to use to sample the change in sl" +
    229         "ope.");
    230       //
    231       // slopeChangeSigmaTextBox
    232       //
    233       this.slopeChangeSigmaTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
    234             | System.Windows.Forms.AnchorStyles.Right)));
    235       this.slopeChangeSigmaTextBox.Location = new System.Drawing.Point(149, 99);
    236       this.slopeChangeSigmaTextBox.Name = "slopeChangeSigmaTextBox";
    237       this.slopeChangeSigmaTextBox.Size = new System.Drawing.Size(168, 20);
    238       this.slopeChangeSigmaTextBox.TabIndex = 7;
    239       this.toolTip.SetToolTip(this.slopeChangeSigmaTextBox, "The sigma parameter for the normal distribution to use to sample the change in sl" +
    240         "ope.");
    241       this.slopeChangeSigmaTextBox.TextChanged += new System.EventHandler(this.slopeChangeSigmaTextBox_TextChanged);
    242       //
    243       // slopeChangeMuLabel
    244       //
    245       this.slopeChangeMuLabel.AutoSize = true;
    246       this.slopeChangeMuLabel.Location = new System.Drawing.Point(6, 76);
    247       this.slopeChangeMuLabel.Name = "slopeChangeMuLabel";
    248       this.slopeChangeMuLabel.Size = new System.Drawing.Size(99, 13);
    249       this.slopeChangeMuLabel.TabIndex = 4;
    250       this.slopeChangeMuLabel.Text = "Slope change (mu):";
    251       this.toolTip.SetToolTip(this.slopeChangeMuLabel, "The nu (mean) parameter for the normal distribution to sample the change in slope" +
    252         ".");
    253       //
    254       // slopeChangeMuTextBox
    255       //
    256       this.slopeChangeMuTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
    257             | System.Windows.Forms.AnchorStyles.Right)));
    258       this.slopeChangeMuTextBox.Location = new System.Drawing.Point(149, 73);
    259       this.slopeChangeMuTextBox.Name = "slopeChangeMuTextBox";
    260       this.slopeChangeMuTextBox.Size = new System.Drawing.Size(168, 20);
    261       this.slopeChangeMuTextBox.TabIndex = 5;
    262       this.toolTip.SetToolTip(this.slopeChangeMuTextBox, "The mu (mean) parameter for the normal distribution to sample the change in slope" +
    263         ".");
    264       this.slopeChangeMuTextBox.TextChanged += new System.EventHandler(this.slopeChangeMuTextBox_TextChanged);
    265       //
    266       // thresholdChangeSigmaLabel
    267       //
    268       this.thresholdChangeSigmaLabel.AutoSize = true;
    269       this.thresholdChangeSigmaLabel.Location = new System.Drawing.Point(6, 44);
    270       this.thresholdChangeSigmaLabel.Name = "thresholdChangeSigmaLabel";
    271       this.thresholdChangeSigmaLabel.Size = new System.Drawing.Size(132, 13);
    272       this.thresholdChangeSigmaLabel.TabIndex = 2;
    273       this.thresholdChangeSigmaLabel.Text = "Threshold change (sigma):";
    274       this.toolTip.SetToolTip(this.thresholdChangeSigmaLabel, "The sigma parameter for the normal distribution to use to sample the change in th" +
    275         "reshold.");
    276       //
    277       // thresholdChangeSigmaTextBox
    278       //
    279       this.thresholdChangeSigmaTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
    280             | System.Windows.Forms.AnchorStyles.Right)));
    281       this.thresholdChangeSigmaTextBox.Location = new System.Drawing.Point(149, 41);
    282       this.thresholdChangeSigmaTextBox.Name = "thresholdChangeSigmaTextBox";
    283       this.thresholdChangeSigmaTextBox.Size = new System.Drawing.Size(168, 20);
    284       this.thresholdChangeSigmaTextBox.TabIndex = 3;
    285       this.toolTip.SetToolTip(this.thresholdChangeSigmaTextBox, "The sigma parameter for the normal distribution to use to sample the change in th" +
    286         "reshold.");
    287       this.thresholdChangeSigmaTextBox.TextChanged += new System.EventHandler(this.thresholdChangeSigmaTextBox_TextChanged);
    288       //
    289       // ThresholdChangeMuLabel
    290       //
    291       this.ThresholdChangeMuLabel.AutoSize = true;
    292       this.ThresholdChangeMuLabel.Location = new System.Drawing.Point(6, 18);
    293       this.ThresholdChangeMuLabel.Name = "ThresholdChangeMuLabel";
    294       this.ThresholdChangeMuLabel.Size = new System.Drawing.Size(119, 13);
    295       this.ThresholdChangeMuLabel.TabIndex = 0;
    296       this.ThresholdChangeMuLabel.Text = "Threshold change (mu):";
    297       this.toolTip.SetToolTip(this.ThresholdChangeMuLabel, "The nu (mean) parameter for the normal distribution to sample the change in thres" +
    298         "hold.");
    299       //
    300       // thresholdChangeMuTextBox
    301       //
    302       this.thresholdChangeMuTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
    303             | System.Windows.Forms.AnchorStyles.Right)));
    304       this.thresholdChangeMuTextBox.Location = new System.Drawing.Point(149, 15);
    305       this.thresholdChangeMuTextBox.Name = "thresholdChangeMuTextBox";
    306       this.thresholdChangeMuTextBox.Size = new System.Drawing.Size(168, 20);
    307       this.thresholdChangeMuTextBox.TabIndex = 1;
    308       this.toolTip.SetToolTip(this.thresholdChangeMuTextBox, "The mu (mean) parameter for the normal distribution to sample the change in thres" +
    309         "hold.");
    310       this.thresholdChangeMuTextBox.TextChanged += new System.EventHandler(this.thresholdChangeMuTextBox_TextChanged);
     340      //
     341      // thresholdInitializationMuLabel
     342      //
     343      this.thresholdInitializationMuLabel.AutoSize = true;
     344      this.thresholdInitializationMuLabel.Location = new System.Drawing.Point(6, 18);
     345      this.thresholdInitializationMuLabel.Name = "thresholdInitializationMuLabel";
     346      this.thresholdInitializationMuLabel.Size = new System.Drawing.Size(80, 13);
     347      this.thresholdInitializationMuLabel.TabIndex = 0;
     348      this.thresholdInitializationMuLabel.Text = "Threshold (mu):";
     349      this.toolTip.SetToolTip(this.thresholdInitializationMuLabel, "The mu (mean) parameter of the normal distribution to use for initial weights.");
     350      //
     351      // thresholdInitializationMuTextBox
     352      //
     353      this.thresholdInitializationMuTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
     354            | System.Windows.Forms.AnchorStyles.Right)));
     355      this.thresholdInitializationMuTextBox.Location = new System.Drawing.Point(114, 15);
     356      this.thresholdInitializationMuTextBox.Name = "thresholdInitializationMuTextBox";
     357      this.thresholdInitializationMuTextBox.Size = new System.Drawing.Size(380, 20);
     358      this.thresholdInitializationMuTextBox.TabIndex = 1;
     359      this.toolTip.SetToolTip(this.thresholdInitializationMuTextBox, "The mu (mean) parameter of the normal distribution from which to sample the initi" +
     360        "al thresholds.");
    311361      //
    312362      // VariableConditionView
     
    314364      this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
    315365      this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
    316       this.Controls.Add(this.mutationGroupBox);
    317       this.Controls.Add(this.initializationGroupBox);
     366      this.Controls.Add(this.tabControl);
    318367      this.Name = "VariableConditionView";
    319       this.Size = new System.Drawing.Size(326, 376);
     368      this.Size = new System.Drawing.Size(520, 426);
    320369      this.Controls.SetChildIndex(this.maximumArityLabel, 0);
    321370      this.Controls.SetChildIndex(this.maximumArityTextBox, 0);
     
    323372      this.Controls.SetChildIndex(this.minimumArityTextBox, 0);
    324373      this.Controls.SetChildIndex(this.infoLabel, 0);
    325       this.Controls.SetChildIndex(this.initializationGroupBox, 0);
    326374      this.Controls.SetChildIndex(this.initialFrequencyTextBox, 0);
    327375      this.Controls.SetChildIndex(this.initialFrequencyLabel, 0);
    328376      this.Controls.SetChildIndex(this.nameLabel, 0);
    329377      this.Controls.SetChildIndex(this.nameTextBox, 0);
    330       this.Controls.SetChildIndex(this.mutationGroupBox, 0);
     378      this.Controls.SetChildIndex(this.tabControl, 0);
    331379      ((System.ComponentModel.ISupportInitialize)(this.errorProvider)).EndInit();
     380      this.mutationGroupBox.ResumeLayout(false);
     381      this.mutationGroupBox.PerformLayout();
     382      this.tabControl.ResumeLayout(false);
     383      this.parametersTabPage.ResumeLayout(false);
    332384      this.initializationGroupBox.ResumeLayout(false);
    333385      this.initializationGroupBox.PerformLayout();
    334       this.mutationGroupBox.ResumeLayout(false);
    335       this.mutationGroupBox.PerformLayout();
    336386      this.ResumeLayout(false);
    337387      this.PerformLayout();
     
    341391    #endregion
    342392
    343     private System.Windows.Forms.Label thresholdInitializationMuLabel;
    344     private System.Windows.Forms.TextBox thresholdInitializationMuTextBox;
    345     protected System.Windows.Forms.GroupBox initializationGroupBox;
    346     private System.Windows.Forms.Label thresholdInitializationSigmaLabel;
    347     private System.Windows.Forms.TextBox thresholdInitializationSigmaTextBox;
    348393    protected System.Windows.Forms.GroupBox mutationGroupBox;
    349394    private System.Windows.Forms.Label thresholdChangeSigmaLabel;
     
    351396    private System.Windows.Forms.Label ThresholdChangeMuLabel;
    352397    private System.Windows.Forms.TextBox thresholdChangeMuTextBox;
     398    private System.Windows.Forms.Label slopeChangeSigmaLabel;
     399    private System.Windows.Forms.TextBox slopeChangeSigmaTextBox;
     400    private System.Windows.Forms.Label slopeChangeMuLabel;
     401    private System.Windows.Forms.TextBox slopeChangeMuTextBox;
     402    protected System.Windows.Forms.TabControl tabControl;
     403    protected System.Windows.Forms.TabPage variableNamesTabPage;
     404    protected System.Windows.Forms.TabPage parametersTabPage;
     405    protected System.Windows.Forms.GroupBox initializationGroupBox;
    353406    private System.Windows.Forms.Label slopeInitializationSigmaLabel;
    354407    private System.Windows.Forms.TextBox slopeInitializationSigmaTextBox;
    355408    private System.Windows.Forms.Label slopeInitializationMuLabel;
    356409    private System.Windows.Forms.TextBox slopeInitializationMuTextBox;
    357     private System.Windows.Forms.Label slopeChangeSigmaLabel;
    358     private System.Windows.Forms.TextBox slopeChangeSigmaTextBox;
    359     private System.Windows.Forms.Label slopeChangeMuLabel;
    360     private System.Windows.Forms.TextBox slopeChangeMuTextBox;
     410    private System.Windows.Forms.Label thresholdInitializationSigmaLabel;
     411    private System.Windows.Forms.TextBox thresholdInitializationSigmaTextBox;
     412    private System.Windows.Forms.Label thresholdInitializationMuLabel;
     413    private System.Windows.Forms.TextBox thresholdInitializationMuTextBox;
    361414
    362415  }
  • trunk/sources/HeuristicLab.Problems.DataAnalysis.Symbolic.Views/3.4/Symbols/VariableConditionView.cs

    r5809 r7869  
    2121
    2222using System;
     23using System.Linq;
    2324using System.Windows.Forms;
     25using HeuristicLab.Collections;
     26using HeuristicLab.Core;
     27using HeuristicLab.Core.Views;
     28using HeuristicLab.Data;
    2429using HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Views;
    2530using HeuristicLab.MainForm;
     
    3035  [Content(typeof(VariableCondition), true)]
    3136  public partial class VariableConditionView : SymbolView {
     37    private CheckedItemCollectionView<StringValue> variableNamesView;
     38
    3239    public new VariableCondition Content {
    3340      get { return (VariableCondition)base.Content; }
     
    3744    public VariableConditionView() {
    3845      InitializeComponent();
     46      variableNamesView = new CheckedItemCollectionView<StringValue>();
     47      variableNamesView.Dock = DockStyle.Fill;
     48      variableNamesTabPage.Controls.Add(variableNamesView);
     49      variableNamesView.Content = new CheckedItemCollection<StringValue>();
     50
     51      RegisterVariableNamesViewContentEvents();
     52    }
     53
     54    private void RegisterVariableNamesViewContentEvents() {
     55      variableNamesView.Content.ItemsAdded += new CollectionItemsChangedEventHandler<StringValue>(variableNames_Changed);
     56      variableNamesView.Content.ItemsRemoved += new CollectionItemsChangedEventHandler<StringValue>(variableNames_Changed);
     57      variableNamesView.Content.CheckedItemsChanged += new CollectionItemsChangedEventHandler<StringValue>(variableNames_Changed);
     58      variableNamesView.Content.CollectionReset += new CollectionItemsChangedEventHandler<StringValue>(variableNames_Changed);
     59      foreach (var variable in variableNamesView.Content) {
     60        variable.ValueChanged += new EventHandler(variable_ValueChanged);
     61      }
     62    }
     63
     64    private void DeregisterVariableNamesViewContentEvents() {
     65      variableNamesView.Content.ItemsAdded -= new CollectionItemsChangedEventHandler<StringValue>(variableNames_Changed);
     66      variableNamesView.Content.ItemsRemoved -= new CollectionItemsChangedEventHandler<StringValue>(variableNames_Changed);
     67      variableNamesView.Content.CheckedItemsChanged -= new CollectionItemsChangedEventHandler<StringValue>(variableNames_Changed);
     68      variableNamesView.Content.CollectionReset -= new CollectionItemsChangedEventHandler<StringValue>(variableNames_Changed);
     69      foreach (var variable in variableNamesView.Content) {
     70        variable.ValueChanged -= new EventHandler(variable_ValueChanged);
     71      }
    3972    }
    4073
     
    76109    }
    77110
    78 
    79 
    80111    private void UpdateControl() {
    81112      if (Content == null) {
     
    88119        slopeChangeMuTextBox.Text = string.Empty;
    89120        slopeChangeSigmaTextBox.Text = string.Empty;
     121        // temporarily deregister to prevent circular calling of events
     122        DeregisterVariableNamesViewContentEvents();
     123        variableNamesView.Content.Clear();
     124        RegisterVariableNamesViewContentEvents();
    90125      } else {
     126        var existingEntries = variableNamesView.Content.ToList();
     127
     128        // temporarily deregister to prevent circular calling of events
     129        DeregisterVariableNamesViewContentEvents();
     130        // add additional entries
     131        foreach (var variableName in Content.VariableNames.Except(existingEntries.Select(x => x.Value)))
     132          variableNamesView.Content.Add(new StringValue(variableName), true);
     133        foreach (var oldEntry in existingEntries.Where(x => !Content.VariableNames.Contains(x.Value)))
     134          variableNamesView.Content.Remove(oldEntry);
     135        RegisterVariableNamesViewContentEvents();
     136
    91137        thresholdInitializationMuTextBox.Text = Content.ThresholdInitializerMu.ToString();
    92138        thresholdInitializationSigmaTextBox.Text = Content.ThresholdInitializerSigma.ToString();
     
    102148
    103149    #region control events
     150    private void variableNames_Changed(object sender, CollectionItemsChangedEventArgs<StringValue> args) {
     151      if (args.Items != null)
     152        foreach (var newVar in args.Items)
     153          newVar.ValueChanged += new EventHandler(variable_ValueChanged);
     154      if (args.OldItems != null)
     155        foreach (var oldVar in args.OldItems)
     156          oldVar.ValueChanged -= new EventHandler(variable_ValueChanged);
     157      UpdateContent();
     158    }
     159
     160    private void variable_ValueChanged(object sender, EventArgs e) {
     161      UpdateContent();
     162    }
     163
     164    private void UpdateContent() {
     165      if (Content != null) {
     166        DeregisterContentEvents();
     167        Content.VariableNames = variableNamesView.Content.CheckedItems.Select(x => x.Value).ToList();
     168        RegisterContentEvents();
     169      }
     170    }
     171
    104172    private void thresholdMuTextBox_TextChanged(object sender, EventArgs e) {
    105173      double value;
     
    162230    }
    163231    #endregion
    164 
    165232  }
    166233}
  • trunk/sources/HeuristicLab.Problems.DataAnalysis.Symbolic.Views/3.4/Symbols/VariableView.Designer.cs

    r7259 r7869  
    7474      this.initialFrequencyTextBox.Size = new System.Drawing.Size(311, 20);
    7575      //
     76      // minimumArityLabel
     77      //
     78      this.toolTip.SetToolTip(this.minimumArityLabel, "The minimum arity of the symbol");
     79      //
     80      // maximumArityLabel
     81      //
     82      this.toolTip.SetToolTip(this.maximumArityLabel, "The maximum arity of the symbol");
     83      //
    7684      // minimumArityTextBox
    7785      //
     
    232240      this.variableNamesTabPage.Name = "variableNamesTabPage";
    233241      this.variableNamesTabPage.Padding = new System.Windows.Forms.Padding(3);
    234       this.variableNamesTabPage.Size = new System.Drawing.Size(400, 141);
     242      this.variableNamesTabPage.Size = new System.Drawing.Size(400, 164);
    235243      this.variableNamesTabPage.TabIndex = 0;
    236244      this.variableNamesTabPage.Text = "Variable Names";
  • trunk/sources/HeuristicLab.Problems.DataAnalysis.Symbolic.Views/3.4/Symbols/VariableView.cs

    r7259 r7869  
    130130      }
    131131    }
    132 
    133132
    134133    private void weightMuTextBox_TextChanged(object sender, EventArgs e) {
  • trunk/sources/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Symbols/VariableCondition.cs

    r7671 r7869  
    152152    #region persistence and cloning
    153153    [StorableConstructor]
    154     private VariableCondition(bool deserializing) : base(deserializing) { }
     154    private VariableCondition(bool deserializing)
     155      : base(deserializing) {
     156      variableNames = new List<string>();
     157    }
    155158    private VariableCondition(VariableCondition original, Cloner cloner)
    156159      : base(original, cloner) {
Note: See TracChangeset for help on using the changeset viewer.