Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
09/20/11 11:12:10 (13 years ago)
Author:
mkommend
Message:

#1479: Merged grammar editor branch into trunk.

Location:
trunk/sources
Files:
9 edited

Legend:

Unmodified
Added
Removed

  • trunk/sources

  • trunk/sources/HeuristicLab.Problems.DataAnalysis.Symbolic.Views/3.4/HeuristicLab.Problems.DataAnalysis.Symbolic.Views-3.4.csproj

    r6656 r6803  
    9393  </PropertyGroup>
    9494  <ItemGroup>
    95     <Reference Include="HeuristicLab.Common.Resources-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=x86" />
    9695    <Reference Include="System" />
    9796    <Reference Include="System.Core">
    … …  
    187186      <Project>{958B43BC-CC5C-4FA2-8628-2B3B01D890B6}</Project>
    188187      <Name>HeuristicLab.Collections-3.3</Name>
     188    </ProjectReference>
     189    <ProjectReference Include="..\..\HeuristicLab.Common.Resources\3.3\HeuristicLab.Common.Resources-3.3.csproj">
     190      <Project>{0E27A536-1C4A-4624-A65E-DC4F4F23E3E1}</Project>
     191      <Name>HeuristicLab.Common.Resources-3.3</Name>
    189192    </ProjectReference>
    190193    <ProjectReference Include="..\..\HeuristicLab.Common\3.3\HeuristicLab.Common-3.3.csproj">

  • trunk/sources/HeuristicLab.Problems.DataAnalysis.Symbolic.Views/3.4/InteractiveSymbolicDataAnalysisSolutionSimplifierView.cs

    r6256 r6803  
    9595          List<ISymbolicExpressionTreeNode> nodeList = Content.Model.SymbolicExpressionTree.Root.GetSubtree(0).IterateNodesPrefix().ToList();
    9696          foreach (var parent in nodeList) {
    97             for (int subTreeIndex = 0; subTreeIndex < parent.SubtreesCount; subTreeIndex++) {
     97            for (int subTreeIndex = 0; subTreeIndex < parent.SubtreeCount; subTreeIndex++) {
    9898              var child = parent.GetSubtree(subTreeIndex);
    9999              if (!(child.Symbol is Constant) && nodeImpacts[child].IsAlmost(0.0)) {
    … …  
    105105
    106106        // show only interesting part of solution
    107         if (tree.Root.SubtreesCount > 1)
     107        if (tree.Root.SubtreeCount > 1)
    108108          this.treeChart.Tree = new SymbolicExpressionTree(tree.Root); // RPB + ADFs
    109109        else
    … …  
    130130      var tree = Content.Model.SymbolicExpressionTree;
    131131      foreach (SymbolicExpressionTreeNode treeNode in tree.IterateNodesPostfix()) {
    132         for (int i = 0; i < treeNode.SubtreesCount; i++) {
     132        for (int i = 0; i < treeNode.SubtreeCount; i++) {
    133133          ISymbolicExpressionTreeNode subTree = treeNode.GetSubtree(i);
    134134          // only allow to replace nodes for which a replacement value is known (replacement value for ADF nodes are not available)
    … …  
    137137
    138138            // show only interesting part of solution
    139             if (tree.Root.SubtreesCount > 1)
     139            if (tree.Root.SubtreeCount > 1)
    140140              this.treeChart.Tree = new SymbolicExpressionTree(tree.Root); // RPB + ADFs
    141141            else

  • trunk/sources/HeuristicLab.Problems.DataAnalysis.Symbolic.Views/3.4/Symbols/ConstantView.Designer.cs

    r5832 r6803  
    6969      this.initialFrequencyTextBox.Size = new System.Drawing.Size(280, 20);
    7070      //
     71      // minimumArityLabel
     72      //
     73      this.toolTip.SetToolTip(this.minimumArityLabel, "Relative frequency of the symbol in randomly created trees");
     74      //
     75      // maximumArityLabel
     76      //
     77      this.toolTip.SetToolTip(this.maximumArityLabel, "Relative frequency of the symbol in randomly created trees");
     78      //
     79      // minimumArityTextBox
     80      //
     81      this.errorProvider.SetIconAlignment(this.minimumArityTextBox, System.Windows.Forms.ErrorIconAlignment.MiddleLeft);
     82      this.minimumArityTextBox.Size = new System.Drawing.Size(280, 20);
     83      //
     84      // maximumArityTextBox
     85      //
     86      this.errorProvider.SetIconAlignment(this.maximumArityTextBox, System.Windows.Forms.ErrorIconAlignment.MiddleLeft);
     87      this.maximumArityTextBox.Size = new System.Drawing.Size(280, 20);
     88      //
    7189      // nameTextBox
    7290      //
    … …  
    91109      // minValueTextBox
    92110      //
    93       this.minValueTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
    94                   | System.Windows.Forms.AnchorStyles.Right)));
     111      this.minValueTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
     112            | System.Windows.Forms.AnchorStyles.Right)));
    95113      this.errorProvider.SetIconAlignment(this.minValueTextBox, System.Windows.Forms.ErrorIconAlignment.MiddleLeft);
    96114      this.minValueTextBox.Location = new System.Drawing.Point(92, 19);
    … …  
    103121      // initializationGroupBox
    104122      //
    105       this.initializationGroupBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
    106                   | System.Windows.Forms.AnchorStyles.Right)));
     123      this.initializationGroupBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
     124            | System.Windows.Forms.AnchorStyles.Right)));
    107125      this.initializationGroupBox.Controls.Add(this.weightSigmaLabel);
    108126      this.initializationGroupBox.Controls.Add(this.maxValueTextBox);
    109127      this.initializationGroupBox.Controls.Add(this.weightNuLabel);
    110128      this.initializationGroupBox.Controls.Add(this.minValueTextBox);
    111       this.initializationGroupBox.Location = new System.Drawing.Point(0, 52);
     129      this.initializationGroupBox.Location = new System.Drawing.Point(0, 127);
    112130      this.initializationGroupBox.Name = "initializationGroupBox";
    113131      this.initializationGroupBox.Size = new System.Drawing.Size(398, 73);
    … …  
    128146      // maxValueTextBox
    129147      //
    130       this.maxValueTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
    131                   | System.Windows.Forms.AnchorStyles.Right)));
     148      this.maxValueTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
     149            | System.Windows.Forms.AnchorStyles.Right)));
    132150      this.errorProvider.SetIconAlignment(this.maxValueTextBox, System.Windows.Forms.ErrorIconAlignment.MiddleLeft);
    133151      this.maxValueTextBox.Location = new System.Drawing.Point(92, 45);
    … …  
    140158      // mutationGroupBox
    141159      //
    142       this.mutationGroupBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
    143                   | System.Windows.Forms.AnchorStyles.Right)));
     160      this.mutationGroupBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
     161            | System.Windows.Forms.AnchorStyles.Right)));
    144162      this.mutationGroupBox.Controls.Add(this.multiplicativeChangeLabel);
    145163      this.mutationGroupBox.Controls.Add(this.multiplicativeChangeSigmaTextBox);
    146164      this.mutationGroupBox.Controls.Add(this.additiveChangeLabel);
    147165      this.mutationGroupBox.Controls.Add(this.additiveChangeSigmaTextBox);
    148       this.mutationGroupBox.Location = new System.Drawing.Point(0, 131);
     166      this.mutationGroupBox.Location = new System.Drawing.Point(0, 206);
    149167      this.mutationGroupBox.Name = "mutationGroupBox";
    150168      this.mutationGroupBox.Size = new System.Drawing.Size(398, 73);
    … …  
    162180      this.multiplicativeChangeLabel.Text = "Multiplicative change (sigma):";
    163181      this.toolTip.SetToolTip(this.multiplicativeChangeLabel, "The sigma (std. dev.) parameter for the normal distribution to use to sample the " +
    164               "multiplicative change.");
     182        "multiplicative change.");
    165183      //
    166184      // multiplicativeChangeSigmaTextBox
    167185      //
    168       this.multiplicativeChangeSigmaTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
    169                   | System.Windows.Forms.AnchorStyles.Right)));
     186      this.multiplicativeChangeSigmaTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
     187            | System.Windows.Forms.AnchorStyles.Right)));
    170188      this.errorProvider.SetIconAlignment(this.multiplicativeChangeSigmaTextBox, System.Windows.Forms.ErrorIconAlignment.MiddleLeft);
    171189      this.multiplicativeChangeSigmaTextBox.Location = new System.Drawing.Point(168, 45);
    … …  
    174192      this.multiplicativeChangeSigmaTextBox.TabIndex = 3;
    175193      this.toolTip.SetToolTip(this.multiplicativeChangeSigmaTextBox, "The sigma (std. dev.) parameter for the normal distribution to use to sample a mu" +
    176               "ltiplicative change.");
     194        "ltiplicative change.");
    177195      this.multiplicativeChangeSigmaTextBox.TextChanged += new System.EventHandler(this.multiplicativeChangeSigmaTextBox_TextChanged);
    178196      //
    … …  
    186204      this.additiveChangeLabel.Text = "Additive change (sigma):";
    187205      this.toolTip.SetToolTip(this.additiveChangeLabel, "The sigma (std. dev.) parameter for the normal distribution to sample the additiv" +
    188               "e change.");
     206        "e change.");
    189207      //
    190208      // additiveChangeSigmaTextBox
    191209      //
    192       this.additiveChangeSigmaTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
    193                   | System.Windows.Forms.AnchorStyles.Right)));
     210      this.additiveChangeSigmaTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
     211            | System.Windows.Forms.AnchorStyles.Right)));
    194212      this.errorProvider.SetIconAlignment(this.additiveChangeSigmaTextBox, System.Windows.Forms.ErrorIconAlignment.MiddleLeft);
    195213      this.additiveChangeSigmaTextBox.Location = new System.Drawing.Point(168, 19);
    … …  
    198216      this.additiveChangeSigmaTextBox.TabIndex = 1;
    199217      this.toolTip.SetToolTip(this.additiveChangeSigmaTextBox, "The sigma (std. dev.) parameter for the normal distribution to use to sample an a" +
    200               "dditive change.");
     218        "dditive change.");
    201219      this.additiveChangeSigmaTextBox.TextChanged += new System.EventHandler(this.additiveChangeSigmaTextBox_TextChanged);
    202220      //
    … …  
    208226      this.Controls.Add(this.initializationGroupBox);
    209227      this.Name = "ConstantView";
    210       this.Size = new System.Drawing.Size(398, 211);
     228      this.Size = new System.Drawing.Size(398, 284);
     229      this.Controls.SetChildIndex(this.maximumArityLabel, 0);
     230      this.Controls.SetChildIndex(this.maximumArityTextBox, 0);
     231      this.Controls.SetChildIndex(this.minimumArityLabel, 0);
     232      this.Controls.SetChildIndex(this.minimumArityTextBox, 0);
    211233      this.Controls.SetChildIndex(this.infoLabel, 0);
    212234      this.Controls.SetChildIndex(this.initializationGroupBox, 0);

  • trunk/sources/HeuristicLab.Problems.DataAnalysis.Symbolic.Views/3.4/Symbols/LaggedVariableView.Designer.cs

    r5832 r6803  
    6464      //
    6565      this.toolTip.SetToolTip(this.weightInitializationMuTextBox, "The mu (mean) parameter of the normal distribution from which to sample the initi" +
    66               "al weights.");
     66        "al weights.");
    6767      //
    6868      // initializationGroupBox
    … …  
    7878      //
    7979      this.toolTip.SetToolTip(this.weightInitializationSigmaTextBox, "The sigma parameter for the normal distribution from which to sample the initial " +
    80               "weights.");
     80        "weights.");
    8181      //
    8282      // mutationGroupBox
    … …  
    8888      //
    8989      this.toolTip.SetToolTip(this.multiplicativeWeightChangeLabel, "The sigma parameter for the normal distribution to use to sample a multiplicative" +
    90               " change in weight.");
     90        " change in weight.");
    9191      //
    9292      // multiplicativeWeightChangeSigmaTextBox
    9393      //
    9494      this.toolTip.SetToolTip(this.multiplicativeWeightChangeSigmaTextBox, "The sigma (std.dev.) parameter for the normal distribution to sample a multiplica" +
    95               "tive change in weight.");
     95        "tive change in weight.");
    9696      //
    9797      // additiveWeightChangeLabel
    9898      //
    9999      this.toolTip.SetToolTip(this.additiveWeightChangeLabel, "The sigma (std.dev.) parameter for the normal distribution to sample an additive " +
    100               "change in weight.");
     100        "change in weight.");
    101101      //
    102102      // additiveWeightChangeSigmaTextBox
    103103      //
    104104      this.toolTip.SetToolTip(this.additiveWeightChangeSigmaTextBox, "The sigma (std.dev.) parameter for the normal distribution to sample an additive " +
    105               "change in weight.");
     105        "change in weight.");
    106106      //
    107107      // variableNamesTabPage
    108108      //
    109       this.variableNamesTabPage.Size = new System.Drawing.Size(400, 164);
     109      this.variableNamesTabPage.Size = new System.Drawing.Size(400, 149);
    110110      //
    111111      // parametersTabPage
    … …  
    115115      // tabControl
    116116      //
    117       this.tabControl.Location = new System.Drawing.Point(0, 104);
    118       this.tabControl.Size = new System.Drawing.Size(408, 190);
     117      this.tabControl.Location = new System.Drawing.Point(0, 179);
     118      this.tabControl.Size = new System.Drawing.Size(408, 175);
    119119      this.tabControl.TabIndex = 9;
    120120      //
    … …  
    126126      //
    127127      this.errorProvider.SetIconAlignment(this.initialFrequencyTextBox, System.Windows.Forms.ErrorIconAlignment.MiddleLeft);
     128      //
     129      // minimumArityLabel
     130      //
     131      this.toolTip.SetToolTip(this.minimumArityLabel, "Relative frequency of the symbol in randomly created trees");
     132      //
     133      // maximumArityLabel
     134      //
     135      this.toolTip.SetToolTip(this.maximumArityLabel, "Relative frequency of the symbol in randomly created trees");
     136      //
     137      // minimumArityTextBox
     138      //
     139      this.errorProvider.SetIconAlignment(this.minimumArityTextBox, System.Windows.Forms.ErrorIconAlignment.MiddleLeft);
     140      this.minimumArityTextBox.Size = new System.Drawing.Size(315, 20);
     141      //
     142      // maximumArityTextBox
     143      //
     144      this.errorProvider.SetIconAlignment(this.maximumArityTextBox, System.Windows.Forms.ErrorIconAlignment.MiddleLeft);
     145      this.maximumArityTextBox.Size = new System.Drawing.Size(315, 20);
    128146      //
    129147      // nameTextBox
    … …  
    135153      //
    136154      this.minTimeOffsetLabel.AutoSize = true;
    137       this.minTimeOffsetLabel.Location = new System.Drawing.Point(3, 55);
     155      this.minTimeOffsetLabel.Location = new System.Drawing.Point(3, 130);
    138156      this.minTimeOffsetLabel.Name = "minTimeOffsetLabel";
    139157      this.minTimeOffsetLabel.Size = new System.Drawing.Size(81, 13);
    … …  
    144162      //
    145163      this.maxTimeOffsetLabel.AutoSize = true;
    146       this.maxTimeOffsetLabel.Location = new System.Drawing.Point(3, 81);
     164      this.maxTimeOffsetLabel.Location = new System.Drawing.Point(3, 156);
    147165      this.maxTimeOffsetLabel.Name = "maxTimeOffsetLabel";
    148166      this.maxTimeOffsetLabel.Size = new System.Drawing.Size(84, 13);
    … …  
    152170      // minTimeOffsetTextBox
    153171      //
    154       this.minTimeOffsetTextBox.Location = new System.Drawing.Point(93, 52);
     172      this.minTimeOffsetTextBox.Location = new System.Drawing.Point(93, 127);
    155173      this.minTimeOffsetTextBox.Name = "minTimeOffsetTextBox";
    156174      this.minTimeOffsetTextBox.Size = new System.Drawing.Size(315, 20);
    … …  
    160178      // maxTimeOffsetTextBox
    161179      //
    162       this.maxTimeOffsetTextBox.Location = new System.Drawing.Point(93, 78);
     180      this.maxTimeOffsetTextBox.Location = new System.Drawing.Point(93, 153);
    163181      this.maxTimeOffsetTextBox.Name = "maxTimeOffsetTextBox";
    164182      this.maxTimeOffsetTextBox.Size = new System.Drawing.Size(315, 20);
    … …  
    171189      this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
    172190      this.Controls.Add(this.minTimeOffsetTextBox);
     191      this.Controls.Add(this.maxTimeOffsetLabel);
    173192      this.Controls.Add(this.minTimeOffsetLabel);
    174       this.Controls.Add(this.maxTimeOffsetLabel);
    175193      this.Controls.Add(this.maxTimeOffsetTextBox);
    176194      this.Name = "LaggedVariableView";
    177       this.Size = new System.Drawing.Size(408, 292);
     195      this.Size = new System.Drawing.Size(408, 352);
    178196      this.Controls.SetChildIndex(this.maxTimeOffsetTextBox, 0);
     197      this.Controls.SetChildIndex(this.minTimeOffsetLabel, 0);
    179198      this.Controls.SetChildIndex(this.maxTimeOffsetLabel, 0);
    180       this.Controls.SetChildIndex(this.minTimeOffsetLabel, 0);
    181199      this.Controls.SetChildIndex(this.minTimeOffsetTextBox, 0);
     200      this.Controls.SetChildIndex(this.maximumArityLabel, 0);
     201      this.Controls.SetChildIndex(this.maximumArityTextBox, 0);
     202      this.Controls.SetChildIndex(this.minimumArityLabel, 0);
     203      this.Controls.SetChildIndex(this.minimumArityTextBox, 0);
    182204      this.Controls.SetChildIndex(this.infoLabel, 0);
    183205      this.Controls.SetChildIndex(this.tabControl, 0);

  • trunk/sources/HeuristicLab.Problems.DataAnalysis.Symbolic.Views/3.4/Symbols/TimeLagView.Designer.cs

    r5832 r6803  
    6262      this.initialFrequencyTextBox.Size = new System.Drawing.Size(315, 20);
    6363      //
     64      // minimumArityLabel
     65      //
     66      this.toolTip.SetToolTip(this.minimumArityLabel, "Relative frequency of the symbol in randomly created trees");
     67      //
     68      // maximumArityLabel
     69      //
     70      this.toolTip.SetToolTip(this.maximumArityLabel, "Relative frequency of the symbol in randomly created trees");
     71      //
     72      // minimumArityTextBox
     73      //
     74      this.errorProvider.SetIconAlignment(this.minimumArityTextBox, System.Windows.Forms.ErrorIconAlignment.MiddleLeft);
     75      //
     76      // maximumArityTextBox
     77      //
     78      this.errorProvider.SetIconAlignment(this.maximumArityTextBox, System.Windows.Forms.ErrorIconAlignment.MiddleLeft);
     79      //
    6480      // nameTextBox
    6581      //
    … …  
    7591      //
    7692      this.minTimeOffsetLabel.AutoSize = true;
    77       this.minTimeOffsetLabel.Location = new System.Drawing.Point(3, 55);
     93      this.minTimeOffsetLabel.Location = new System.Drawing.Point(3, 130);
    7894      this.minTimeOffsetLabel.Name = "minTimeOffsetLabel";
    7995      this.minTimeOffsetLabel.Size = new System.Drawing.Size(81, 13);
    … …  
    84100      //
    85101      this.maxTimeOffsetLabel.AutoSize = true;
    86       this.maxTimeOffsetLabel.Location = new System.Drawing.Point(3, 81);
     102      this.maxTimeOffsetLabel.Location = new System.Drawing.Point(3, 156);
    87103      this.maxTimeOffsetLabel.Name = "maxTimeOffsetLabel";
    88104      this.maxTimeOffsetLabel.Size = new System.Drawing.Size(84, 13);
    … …  
    92108      // minTimeOffsetTextBox
    93109      //
    94       this.minTimeOffsetTextBox.Location = new System.Drawing.Point(93, 52);
     110      this.minTimeOffsetTextBox.Location = new System.Drawing.Point(93, 127);
    95111      this.minTimeOffsetTextBox.Name = "minTimeOffsetTextBox";
    96112      this.minTimeOffsetTextBox.Size = new System.Drawing.Size(315, 20);
    … …  
    100116      // maxTimeOffsetTextBox
    101117      //
    102       this.maxTimeOffsetTextBox.Location = new System.Drawing.Point(93, 78);
     118      this.maxTimeOffsetTextBox.Location = new System.Drawing.Point(93, 153);
    103119      this.maxTimeOffsetTextBox.Name = "maxTimeOffsetTextBox";
    104120      this.maxTimeOffsetTextBox.Size = new System.Drawing.Size(315, 20);
    … …  
    115131      this.Controls.Add(this.minTimeOffsetLabel);
    116132      this.Name = "LaggedSymbolView";
    117       this.Size = new System.Drawing.Size(408, 104);
     133      this.Size = new System.Drawing.Size(408, 179);
     134      this.Controls.SetChildIndex(this.maximumArityLabel, 0);
     135      this.Controls.SetChildIndex(this.maximumArityTextBox, 0);
     136      this.Controls.SetChildIndex(this.minimumArityLabel, 0);
     137      this.Controls.SetChildIndex(this.minimumArityTextBox, 0);
    118138      this.Controls.SetChildIndex(this.infoLabel, 0);
    119139      this.Controls.SetChildIndex(this.initialFrequencyTextBox, 0);

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

    r5832 r6803  
    7878      this.initialFrequencyTextBox.Size = new System.Drawing.Size(233, 20);
    7979      //
     80      // minimumArityLabel
     81      //
     82      this.toolTip.SetToolTip(this.minimumArityLabel, "Relative frequency of the symbol in randomly created trees");
     83      //
     84      // maximumArityLabel
     85      //
     86      this.toolTip.SetToolTip(this.maximumArityLabel, "Relative frequency of the symbol in randomly created trees");
     87      //
     88      // minimumArityTextBox
     89      //
     90      this.errorProvider.SetIconAlignment(this.minimumArityTextBox, System.Windows.Forms.ErrorIconAlignment.MiddleLeft);
     91      //
     92      // maximumArityTextBox
     93      //
     94      this.errorProvider.SetIconAlignment(this.maximumArityTextBox, System.Windows.Forms.ErrorIconAlignment.MiddleLeft);
     95      //
    8096      // nameTextBox
    8197      //
    … …  
    96112      // thresholdInitializationMuTextBox
    97113      //
    98       this.thresholdInitializationMuTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
    99                   | System.Windows.Forms.AnchorStyles.Right)));
     114      this.thresholdInitializationMuTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
     115            | System.Windows.Forms.AnchorStyles.Right)));
    100116      this.thresholdInitializationMuTextBox.Location = new System.Drawing.Point(114, 15);
    101117      this.thresholdInitializationMuTextBox.Name = "thresholdInitializationMuTextBox";
    … …  
    103119      this.thresholdInitializationMuTextBox.TabIndex = 1;
    104120      this.toolTip.SetToolTip(this.thresholdInitializationMuTextBox, "The mu (mean) parameter of the normal distribution from which to sample the initi" +
    105               "al thresholds.");
     121        "al thresholds.");
    106122      this.thresholdInitializationMuTextBox.TextChanged += new System.EventHandler(this.thresholdMuTextBox_TextChanged);
    107123      //
    108124      // initializationGroupBox
    109125      //
    110       this.initializationGroupBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
    111                   | System.Windows.Forms.AnchorStyles.Right)));
     126      this.initializationGroupBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
     127            | System.Windows.Forms.AnchorStyles.Right)));
    112128      this.initializationGroupBox.Controls.Add(this.slopeInitializationSigmaLabel);
    113129      this.initializationGroupBox.Controls.Add(this.slopeInitializationSigmaTextBox);
    … …  
    118134      this.initializationGroupBox.Controls.Add(this.thresholdInitializationMuLabel);
    119135      this.initializationGroupBox.Controls.Add(this.thresholdInitializationMuTextBox);
    120       this.initializationGroupBox.Location = new System.Drawing.Point(0, 52);
     136      this.initializationGroupBox.Location = new System.Drawing.Point(0, 127);
    121137      this.initializationGroupBox.Name = "initializationGroupBox";
    122138      this.initializationGroupBox.Size = new System.Drawing.Size(326, 127);
    … …  
    137153      // slopeInitializationSigmaTextBox
    138154      //
    139       this.slopeInitializationSigmaTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
    140                   | System.Windows.Forms.AnchorStyles.Right)));
     155      this.slopeInitializationSigmaTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
     156            | System.Windows.Forms.AnchorStyles.Right)));
    141157      this.slopeInitializationSigmaTextBox.Location = new System.Drawing.Point(114, 102);
    142158      this.slopeInitializationSigmaTextBox.Name = "slopeInitializationSigmaTextBox";
    … …  
    144160      this.slopeInitializationSigmaTextBox.TabIndex = 7;
    145161      this.toolTip.SetToolTip(this.slopeInitializationSigmaTextBox, "The sigma parameter for the normal distribution from which to sample the initial " +
    146               "slopes.");
     162        "slopes.");
    147163      this.slopeInitializationSigmaTextBox.TextChanged += new System.EventHandler(this.slopeInitializationSigmaTextBox_TextChanged);
    148164      //
    … …  
    159175      // slopeInitializationMuTextBox
    160176      //
    161       this.slopeInitializationMuTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
    162                   | System.Windows.Forms.AnchorStyles.Right)));
     177      this.slopeInitializationMuTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
     178            | System.Windows.Forms.AnchorStyles.Right)));
    163179      this.slopeInitializationMuTextBox.Location = new System.Drawing.Point(114, 76);
    164180      this.slopeInitializationMuTextBox.Name = "slopeInitializationMuTextBox";
    … …  
    166182      this.slopeInitializationMuTextBox.TabIndex = 5;
    167183      this.toolTip.SetToolTip(this.slopeInitializationMuTextBox, "The mu (mean) parameter of the normal distribution from which to sample the initi" +
    168               "al slopes.");
     184        "al slopes.");
    169185      this.slopeInitializationMuTextBox.TextChanged += new System.EventHandler(this.slopeInitializationMuTextBox_TextChanged);
    170186      //
    … …  
    181197      // thresholdInitializationSigmaTextBox
    182198      //
    183       this.thresholdInitializationSigmaTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
    184                   | System.Windows.Forms.AnchorStyles.Right)));
     199      this.thresholdInitializationSigmaTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
     200            | System.Windows.Forms.AnchorStyles.Right)));
    185201      this.thresholdInitializationSigmaTextBox.Location = new System.Drawing.Point(114, 41);
    186202      this.thresholdInitializationSigmaTextBox.Name = "thresholdInitializationSigmaTextBox";
    … …  
    188204      this.thresholdInitializationSigmaTextBox.TabIndex = 3;
    189205      this.toolTip.SetToolTip(this.thresholdInitializationSigmaTextBox, "The sigma parameter for the normal distribution from which to sample the initial " +
    190               "thresholds.");
     206        "thresholds.");
    191207      this.thresholdInitializationSigmaTextBox.TextChanged += new System.EventHandler(this.thresholdInitializationSigmaTextBox_TextChanged);
    192208      //
    193209      // mutationGroupBox
    194210      //
    195       this.mutationGroupBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
    196                   | System.Windows.Forms.AnchorStyles.Right)));
     211      this.mutationGroupBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
     212            | System.Windows.Forms.AnchorStyles.Right)));
    197213      this.mutationGroupBox.Controls.Add(this.slopeChangeSigmaLabel);
    198214      this.mutationGroupBox.Controls.Add(this.slopeChangeSigmaTextBox);
    … …  
    203219      this.mutationGroupBox.Controls.Add(this.ThresholdChangeMuLabel);
    204220      this.mutationGroupBox.Controls.Add(this.thresholdChangeMuTextBox);
    205       this.mutationGroupBox.Location = new System.Drawing.Point(0, 185);
     221      this.mutationGroupBox.Location = new System.Drawing.Point(0, 260);
    206222      this.mutationGroupBox.Name = "mutationGroupBox";
    207223      this.mutationGroupBox.Size = new System.Drawing.Size(326, 127);
    … …  
    219235      this.slopeChangeSigmaLabel.Text = "Slope change (sigma):";
    220236      this.toolTip.SetToolTip(this.slopeChangeSigmaLabel, "The sigma parameter for the normal distribution to use to sample the change in sl" +
    221               "ope.");
     237        "ope.");
    222238      //
    223239      // slopeChangeSigmaTextBox
    224240      //
    225       this.slopeChangeSigmaTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
    226                   | System.Windows.Forms.AnchorStyles.Right)));
     241      this.slopeChangeSigmaTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
     242            | System.Windows.Forms.AnchorStyles.Right)));
    227243      this.slopeChangeSigmaTextBox.Location = new System.Drawing.Point(149, 99);
    228244      this.slopeChangeSigmaTextBox.Name = "slopeChangeSigmaTextBox";
    … …  
    230246      this.slopeChangeSigmaTextBox.TabIndex = 7;
    231247      this.toolTip.SetToolTip(this.slopeChangeSigmaTextBox, "The sigma parameter for the normal distribution to use to sample the change in sl" +
    232               "ope.");
     248        "ope.");
    233249      this.slopeChangeSigmaTextBox.TextChanged += new System.EventHandler(this.slopeChangeSigmaTextBox_TextChanged);
    234250      //
    … …  
    242258      this.slopeChangeMuLabel.Text = "Slope change (mu):";
    243259      this.toolTip.SetToolTip(this.slopeChangeMuLabel, "The nu (mean) parameter for the normal distribution to sample the change in slope" +
    244               ".");
     260        ".");
    245261      //
    246262      // slopeChangeMuTextBox
    247263      //
    248       this.slopeChangeMuTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
    249                   | System.Windows.Forms.AnchorStyles.Right)));
     264      this.slopeChangeMuTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
     265            | System.Windows.Forms.AnchorStyles.Right)));
    250266      this.slopeChangeMuTextBox.Location = new System.Drawing.Point(149, 73);
    251267      this.slopeChangeMuTextBox.Name = "slopeChangeMuTextBox";
    … …  
    253269      this.slopeChangeMuTextBox.TabIndex = 5;
    254270      this.toolTip.SetToolTip(this.slopeChangeMuTextBox, "The mu (mean) parameter for the normal distribution to sample the change in slope" +
    255               ".");
     271        ".");
    256272      this.slopeChangeMuTextBox.TextChanged += new System.EventHandler(this.slopeChangeMuTextBox_TextChanged);
    257273      //
    … …  
    265281      this.thresholdChangeSigmaLabel.Text = "Threshold change (sigma):";
    266282      this.toolTip.SetToolTip(this.thresholdChangeSigmaLabel, "The sigma parameter for the normal distribution to use to sample the change in th" +
    267               "reshold.");
     283        "reshold.");
    268284      //
    269285      // thresholdChangeSigmaTextBox
    270286      //
    271       this.thresholdChangeSigmaTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
    272                   | System.Windows.Forms.AnchorStyles.Right)));
     287      this.thresholdChangeSigmaTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
     288            | System.Windows.Forms.AnchorStyles.Right)));
    273289      this.thresholdChangeSigmaTextBox.Location = new System.Drawing.Point(149, 41);
    274290      this.thresholdChangeSigmaTextBox.Name = "thresholdChangeSigmaTextBox";
    … …  
    276292      this.thresholdChangeSigmaTextBox.TabIndex = 3;
    277293      this.toolTip.SetToolTip(this.thresholdChangeSigmaTextBox, "The sigma parameter for the normal distribution to use to sample the change in th" +
    278               "reshold.");
     294        "reshold.");
    279295      this.thresholdChangeSigmaTextBox.TextChanged += new System.EventHandler(this.thresholdChangeSigmaTextBox_TextChanged);
    280296      //
    … …  
    288304      this.ThresholdChangeMuLabel.Text = "Threshold change (mu):";
    289305      this.toolTip.SetToolTip(this.ThresholdChangeMuLabel, "The nu (mean) parameter for the normal distribution to sample the change in thres" +
    290               "hold.");
     306        "hold.");
    291307      //
    292308      // thresholdChangeMuTextBox
    293309      //
    294       this.thresholdChangeMuTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
    295                   | System.Windows.Forms.AnchorStyles.Right)));
     310      this.thresholdChangeMuTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
     311            | System.Windows.Forms.AnchorStyles.Right)));
    296312      this.thresholdChangeMuTextBox.Location = new System.Drawing.Point(149, 15);
    297313      this.thresholdChangeMuTextBox.Name = "thresholdChangeMuTextBox";
    … …  
    299315      this.thresholdChangeMuTextBox.TabIndex = 1;
    300316      this.toolTip.SetToolTip(this.thresholdChangeMuTextBox, "The mu (mean) parameter for the normal distribution to sample the change in thres" +
    301               "hold.");
     317        "hold.");
    302318      this.thresholdChangeMuTextBox.TextChanged += new System.EventHandler(this.thresholdChangeMuTextBox_TextChanged);
    303319      //
    … …  
    309325      this.Controls.Add(this.initializationGroupBox);
    310326      this.Name = "VariableConditionView";
    311       this.Size = new System.Drawing.Size(326, 315);
     327      this.Size = new System.Drawing.Size(326, 376);
     328      this.Controls.SetChildIndex(this.maximumArityLabel, 0);
     329      this.Controls.SetChildIndex(this.maximumArityTextBox, 0);
     330      this.Controls.SetChildIndex(this.minimumArityLabel, 0);
     331      this.Controls.SetChildIndex(this.minimumArityTextBox, 0);
    312332      this.Controls.SetChildIndex(this.infoLabel, 0);
    313333      this.Controls.SetChildIndex(this.initializationGroupBox, 0);

  • trunk/sources/HeuristicLab.Problems.DataAnalysis.Symbolic.Views/3.4/Symbols/VariableView.Designer.cs

    r5832 r6803  
    7272      //
    7373      this.errorProvider.SetIconAlignment(this.initialFrequencyTextBox, System.Windows.Forms.ErrorIconAlignment.MiddleLeft);
    74       this.initialFrequencyTextBox.Size = new System.Drawing.Size(315, 20);
     74      this.initialFrequencyTextBox.Size = new System.Drawing.Size(311, 20);
     75      //
     76      // minimumArityLabel
     77      //
     78      this.toolTip.SetToolTip(this.minimumArityLabel, "Relative frequency of the symbol in randomly created trees");
     79      //
     80      // maximumArityLabel
     81      //
     82      this.toolTip.SetToolTip(this.maximumArityLabel, "Relative frequency of the symbol in randomly created trees");
     83      //
     84      // minimumArityTextBox
     85      //
     86      this.errorProvider.SetIconAlignment(this.minimumArityTextBox, System.Windows.Forms.ErrorIconAlignment.MiddleLeft);
     87      this.minimumArityTextBox.Size = new System.Drawing.Size(311, 20);
     88      //
     89      // maximumArityTextBox
     90      //
     91      this.errorProvider.SetIconAlignment(this.maximumArityTextBox, System.Windows.Forms.ErrorIconAlignment.MiddleLeft);
     92      this.maximumArityTextBox.Size = new System.Drawing.Size(311, 20);
    7593      //
    7694      // nameTextBox
    … …  
    96114      // weightInitializationMuTextBox
    97115      //
    98       this.weightInitializationMuTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
    99                   | System.Windows.Forms.AnchorStyles.Right)));
     116      this.weightInitializationMuTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
     117            | System.Windows.Forms.AnchorStyles.Right)));
    100118      this.weightInitializationMuTextBox.Location = new System.Drawing.Point(92, 19);
    101119      this.weightInitializationMuTextBox.Name = "weightInitializationMuTextBox";
    … …  
    103121      this.weightInitializationMuTextBox.TabIndex = 1;
    104122      this.toolTip.SetToolTip(this.weightInitializationMuTextBox, "The mu (mean) parameter of the normal distribution from which to sample the initi" +
    105               "al weights.");
     123        "al weights.");
    106124      this.weightInitializationMuTextBox.TextChanged += new System.EventHandler(this.weightMuTextBox_TextChanged);
    107125      //
    108126      // initializationGroupBox
    109127      //
    110       this.initializationGroupBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
    111                   | System.Windows.Forms.AnchorStyles.Right)));
     128      this.initializationGroupBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
     129            | System.Windows.Forms.AnchorStyles.Right)));
    112130      this.initializationGroupBox.Controls.Add(this.weightSigmaLabel);
    113131      this.initializationGroupBox.Controls.Add(this.weightInitializationSigmaTextBox);
    … …  
    133151      // weightInitializationSigmaTextBox
    134152      //
    135       this.weightInitializationSigmaTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
    136                   | System.Windows.Forms.AnchorStyles.Right)));
     153      this.weightInitializationSigmaTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
     154            | System.Windows.Forms.AnchorStyles.Right)));
    137155      this.weightInitializationSigmaTextBox.Location = new System.Drawing.Point(92, 45);
    138156      this.weightInitializationSigmaTextBox.Name = "weightInitializationSigmaTextBox";
    … …  
    140158      this.weightInitializationSigmaTextBox.TabIndex = 3;
    141159      this.toolTip.SetToolTip(this.weightInitializationSigmaTextBox, "The sigma parameter for the normal distribution from which to sample the initial " +
    142               "weights.");
     160        "weights.");
    143161      this.weightInitializationSigmaTextBox.TextChanged += new System.EventHandler(this.weightSigmaTextBox_TextChanged);
    144162      //
    145163      // mutationGroupBox
    146164      //
    147       this.mutationGroupBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
    148                   | System.Windows.Forms.AnchorStyles.Right)));
     165      this.mutationGroupBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
     166            | System.Windows.Forms.AnchorStyles.Right)));
    149167      this.mutationGroupBox.Controls.Add(this.multiplicativeWeightChangeLabel);
    150168      this.mutationGroupBox.Controls.Add(this.multiplicativeWeightChangeSigmaTextBox);
    … …  
    167185      this.multiplicativeWeightChangeLabel.Text = "Multiplicative weight change (sigma):";
    168186      this.toolTip.SetToolTip(this.multiplicativeWeightChangeLabel, "The sigma parameter for the normal distribution to use to sample a multiplicative" +
    169               " change in weight.");
     187        " change in weight.");
    170188      //
    171189      // multiplicativeWeightChangeSigmaTextBox
    172190      //
    173       this.multiplicativeWeightChangeSigmaTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
    174                   | System.Windows.Forms.AnchorStyles.Right)));
     191      this.multiplicativeWeightChangeSigmaTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
     192            | System.Windows.Forms.AnchorStyles.Right)));
    175193      this.multiplicativeWeightChangeSigmaTextBox.Location = new System.Drawing.Point(201, 45);
    176194      this.multiplicativeWeightChangeSigmaTextBox.Name = "multiplicativeWeightChangeSigmaTextBox";
    … …  
    178196      this.multiplicativeWeightChangeSigmaTextBox.TabIndex = 3;
    179197      this.toolTip.SetToolTip(this.multiplicativeWeightChangeSigmaTextBox, "The sigma (std.dev.) parameter for the normal distribution to sample a multiplica" +
    180               "tive change in weight.");
     198        "tive change in weight.");
    181199      this.multiplicativeWeightChangeSigmaTextBox.TextChanged += new System.EventHandler(this.multiplicativeWeightChangeSigmaTextBox_TextChanged);
    182200      //
    … …  
    190208      this.additiveWeightChangeLabel.Text = "Additive weight change (sigma):";
    191209      this.toolTip.SetToolTip(this.additiveWeightChangeLabel, "The sigma (std.dev.) parameter for the normal distribution to sample an additive " +
    192               "change in weight.");
     210        "change in weight.");
    193211      //
    194212      // additiveWeightChangeSigmaTextBox
    195213      //
    196       this.additiveWeightChangeSigmaTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
    197                   | System.Windows.Forms.AnchorStyles.Right)));
     214      this.additiveWeightChangeSigmaTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
     215            | System.Windows.Forms.AnchorStyles.Right)));
    198216      this.additiveWeightChangeSigmaTextBox.Location = new System.Drawing.Point(201, 19);
    199217      this.additiveWeightChangeSigmaTextBox.Name = "additiveWeightChangeSigmaTextBox";
    … …  
    201219      this.additiveWeightChangeSigmaTextBox.TabIndex = 1;
    202220      this.toolTip.SetToolTip(this.additiveWeightChangeSigmaTextBox, "The sigma (std.dev.) parameter for the normal distribution to sample an additive " +
    203               "change in weight.");
     221        "change in weight.");
    204222      this.additiveWeightChangeSigmaTextBox.TextChanged += new System.EventHandler(this.additiveWeightChangeSigmaTextBox_TextChanged);
    205223      //
    206224      // tabControl
    207225      //
    208       this.tabControl.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
    209                   | System.Windows.Forms.AnchorStyles.Left)
    210                   | System.Windows.Forms.AnchorStyles.Right)));
     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)));
    211229      this.tabControl.Controls.Add(this.variableNamesTabPage);
    212230      this.tabControl.Controls.Add(this.parametersTabPage);
    213       this.tabControl.Location = new System.Drawing.Point(0, 52);
     231      this.tabControl.Location = new System.Drawing.Point(0, 127);
    214232      this.tabControl.Name = "tabControl";
    215233      this.tabControl.SelectedIndex = 0;
    216       this.tabControl.Size = new System.Drawing.Size(408, 242);
     234      this.tabControl.Size = new System.Drawing.Size(408, 167);
    217235      this.tabControl.TabIndex = 5;
    218236      //
    … …  
    222240      this.variableNamesTabPage.Name = "variableNamesTabPage";
    223241      this.variableNamesTabPage.Padding = new System.Windows.Forms.Padding(3);
    224       this.variableNamesTabPage.Size = new System.Drawing.Size(400, 216);
     242      this.variableNamesTabPage.Size = new System.Drawing.Size(400, 141);
    225243      this.variableNamesTabPage.TabIndex = 0;
    226244      this.variableNamesTabPage.Text = "Variable Names";
    … …  
    246264      this.Name = "VariableView";
    247265      this.Size = new System.Drawing.Size(408, 294);
     266      this.Controls.SetChildIndex(this.maximumArityLabel, 0);
     267      this.Controls.SetChildIndex(this.maximumArityTextBox, 0);
     268      this.Controls.SetChildIndex(this.minimumArityLabel, 0);
     269      this.Controls.SetChildIndex(this.minimumArityTextBox, 0);
    248270      this.Controls.SetChildIndex(this.infoLabel, 0);
    249271      this.Controls.SetChildIndex(this.initialFrequencyTextBox, 0);

  • trunk/sources/HeuristicLab.Problems.DataAnalysis.Symbolic.Views/3.4/Symbols/VariableView.cs

    r6599 r6803  
    8787    protected override void OnContentChanged() {
    8888      base.OnContentChanged();
    89       variableNamesView.Content.Clear();
    9089      UpdateControl();
    9190    }
    … …  
    126125    private void UpdateContent() {
    127126      if (Content != null) {
    128         Content.Changed -= new EventHandler(Content_Changed);
     127        DeregisterContentEvents();
    129128        Content.VariableNames = variableNamesView.Content.CheckedItems.Select(x => x.Value).ToList();
    130         Content.Changed += new EventHandler(Content_Changed);
     129        RegisterContentEvents();
    131130      }
    132131    }
Note: See TracChangeset for help on using the changeset viewer.