Free cookie consent management tool by TermsFeed Policy Generator

Changeset 8103


Ignore:
Timestamp:
06/25/12 14:31:17 (12 years ago)
Author:
sforsten
Message:

#1821: made changes according to mkommend's comments

Location:
trunk/sources/HeuristicLab.Problems.DataAnalysis.Symbolic.Views/3.4/Symbols
Files:
4 edited

Legend:

Unmodified
Added
Removed

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

    r8053 r8103  
    114114      //
    115115      this.mutationGroupBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
    116             | System.Windows.Forms.AnchorStyles.Right)));
     116                  | System.Windows.Forms.AnchorStyles.Right)));
    117117      this.mutationGroupBox.Controls.Add(this.slopeChangeSigmaLabel);
    118118      this.mutationGroupBox.Controls.Add(this.slopeChangeSigmaTextBox);
    … …  
    139139      this.slopeChangeSigmaLabel.Text = "Slope change (sigma):";
    140140      this.toolTip.SetToolTip(this.slopeChangeSigmaLabel, "The sigma parameter for the normal distribution to use to sample the change in sl" +
    141         "ope.");
     141              "ope.");
    142142      //
    143143      // slopeChangeSigmaTextBox
    144144      //
    145145      this.slopeChangeSigmaTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
    146             | System.Windows.Forms.AnchorStyles.Right)));
     146                  | System.Windows.Forms.AnchorStyles.Right)));
    147147      this.slopeChangeSigmaTextBox.Location = new System.Drawing.Point(149, 99);
    148148      this.slopeChangeSigmaTextBox.Name = "slopeChangeSigmaTextBox";
    … …  
    150150      this.slopeChangeSigmaTextBox.TabIndex = 7;
    151151      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);
     152              "ope.");
     153      this.slopeChangeSigmaTextBox.TextChanged += new System.EventHandler(this.SlopeChangeSigmaTextBox_TextChanged);
    154154      //
    155155      // slopeChangeMuLabel
    … …  
    162162      this.slopeChangeMuLabel.Text = "Slope change (mu):";
    163163      this.toolTip.SetToolTip(this.slopeChangeMuLabel, "The nu (mean) parameter for the normal distribution to sample the change in slope" +
    164         ".");
     164              ".");
    165165      //
    166166      // slopeChangeMuTextBox
    167167      //
    168168      this.slopeChangeMuTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
    169             | System.Windows.Forms.AnchorStyles.Right)));
     169                  | System.Windows.Forms.AnchorStyles.Right)));
    170170      this.slopeChangeMuTextBox.Location = new System.Drawing.Point(149, 73);
    171171      this.slopeChangeMuTextBox.Name = "slopeChangeMuTextBox";
    … …  
    173173      this.slopeChangeMuTextBox.TabIndex = 5;
    174174      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);
     175              ".");
     176      this.slopeChangeMuTextBox.TextChanged += new System.EventHandler(this.SlopeChangeMuTextBox_TextChanged);
    177177      //
    178178      // thresholdChangeSigmaLabel
    … …  
    185185      this.thresholdChangeSigmaLabel.Text = "Threshold change (sigma):";
    186186      this.toolTip.SetToolTip(this.thresholdChangeSigmaLabel, "The sigma parameter for the normal distribution to use to sample the change in th" +
    187         "reshold.");
     187              "reshold.");
    188188      //
    189189      // thresholdChangeSigmaTextBox
    190190      //
    191191      this.thresholdChangeSigmaTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
    192             | System.Windows.Forms.AnchorStyles.Right)));
     192                  | System.Windows.Forms.AnchorStyles.Right)));
    193193      this.thresholdChangeSigmaTextBox.Location = new System.Drawing.Point(149, 41);
    194194      this.thresholdChangeSigmaTextBox.Name = "thresholdChangeSigmaTextBox";
    … …  
    196196      this.thresholdChangeSigmaTextBox.TabIndex = 3;
    197197      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);
     198              "reshold.");
     199      this.thresholdChangeSigmaTextBox.TextChanged += new System.EventHandler(this.ThresholdChangeSigmaTextBox_TextChanged);
    200200      //
    201201      // ThresholdChangeMuLabel
    … …  
    208208      this.ThresholdChangeMuLabel.Text = "Threshold change (mu):";
    209209      this.toolTip.SetToolTip(this.ThresholdChangeMuLabel, "The nu (mean) parameter for the normal distribution to sample the change in thres" +
    210         "hold.");
     210              "hold.");
    211211      //
    212212      // thresholdChangeMuTextBox
    213213      //
    214214      this.thresholdChangeMuTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
    215             | System.Windows.Forms.AnchorStyles.Right)));
     215                  | System.Windows.Forms.AnchorStyles.Right)));
    216216      this.thresholdChangeMuTextBox.Location = new System.Drawing.Point(149, 15);
    217217      this.thresholdChangeMuTextBox.Name = "thresholdChangeMuTextBox";
    … …  
    219219      this.thresholdChangeMuTextBox.TabIndex = 1;
    220220      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);
     221              "hold.");
     222      this.thresholdChangeMuTextBox.TextChanged += new System.EventHandler(this.ThresholdChangeMuTextBox_TextChanged);
    223223      //
    224224      // tabControl
    225225      //
    226226      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)));
     227                  | System.Windows.Forms.AnchorStyles.Left)
     228                  | System.Windows.Forms.AnchorStyles.Right)));
    229229      this.tabControl.Controls.Add(this.variableNamesTabPage);
    230230      this.tabControl.Controls.Add(this.parametersTabPage);
    … …  
    260260      //
    261261      this.initializationGroupBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
    262             | System.Windows.Forms.AnchorStyles.Right)));
     262                  | System.Windows.Forms.AnchorStyles.Right)));
    263263      this.initializationGroupBox.Controls.Add(this.slopeInitializationSigmaLabel);
    264264      this.initializationGroupBox.Controls.Add(this.slopeInitializationSigmaTextBox);
    … …  
    289289      //
    290290      this.slopeInitializationSigmaTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
    291             | System.Windows.Forms.AnchorStyles.Right)));
     291                  | System.Windows.Forms.AnchorStyles.Right)));
    292292      this.slopeInitializationSigmaTextBox.Location = new System.Drawing.Point(114, 102);
    293293      this.slopeInitializationSigmaTextBox.Name = "slopeInitializationSigmaTextBox";
    … …  
    295295      this.slopeInitializationSigmaTextBox.TabIndex = 7;
    296296      this.toolTip.SetToolTip(this.slopeInitializationSigmaTextBox, "The sigma parameter for the normal distribution from which to sample the initial " +
    297         "slopes.");
     297              "slopes.");
     298      this.slopeInitializationSigmaTextBox.TextChanged += new System.EventHandler(this.SlopeInitializationSigmaTextBox_TextChanged);
    298299      //
    299300      // slopeInitializationMuLabel
    … …  
    310311      //
    311312      this.slopeInitializationMuTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
    312             | System.Windows.Forms.AnchorStyles.Right)));
     313                  | System.Windows.Forms.AnchorStyles.Right)));
    313314      this.slopeInitializationMuTextBox.Location = new System.Drawing.Point(114, 76);
    314315      this.slopeInitializationMuTextBox.Name = "slopeInitializationMuTextBox";
    … …  
    316317      this.slopeInitializationMuTextBox.TabIndex = 5;
    317318      this.toolTip.SetToolTip(this.slopeInitializationMuTextBox, "The mu (mean) parameter of the normal distribution from which to sample the initi" +
    318         "al slopes.");
     319              "al slopes.");
     320      this.slopeInitializationMuTextBox.TextChanged += new System.EventHandler(this.SlopeInitializationMuTextBox_TextChanged);
    319321      //
    320322      // thresholdInitializationSigmaLabel
    … …  
    331333      //
    332334      this.thresholdInitializationSigmaTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
    333             | System.Windows.Forms.AnchorStyles.Right)));
     335                  | System.Windows.Forms.AnchorStyles.Right)));
    334336      this.thresholdInitializationSigmaTextBox.Location = new System.Drawing.Point(114, 41);
    335337      this.thresholdInitializationSigmaTextBox.Name = "thresholdInitializationSigmaTextBox";
    … …  
    337339      this.thresholdInitializationSigmaTextBox.TabIndex = 3;
    338340      this.toolTip.SetToolTip(this.thresholdInitializationSigmaTextBox, "The sigma parameter for the normal distribution from which to sample the initial " +
    339         "thresholds.");
     341              "thresholds.");
     342      this.thresholdInitializationSigmaTextBox.TextChanged += new System.EventHandler(this.ThresholdInitializationSigmaTextBox_TextChanged);
    340343      //
    341344      // thresholdInitializationMuLabel
    … …  
    352355      //
    353356      this.thresholdInitializationMuTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
    354             | System.Windows.Forms.AnchorStyles.Right)));
     357                  | System.Windows.Forms.AnchorStyles.Right)));
    355358      this.thresholdInitializationMuTextBox.Location = new System.Drawing.Point(114, 15);
    356359      this.thresholdInitializationMuTextBox.Name = "thresholdInitializationMuTextBox";
    … …  
    358361      this.thresholdInitializationMuTextBox.TabIndex = 1;
    359362      this.toolTip.SetToolTip(this.thresholdInitializationMuTextBox, "The mu (mean) parameter of the normal distribution from which to sample the initi" +
    360         "al thresholds.");
     363              "al thresholds.");
     364      this.thresholdInitializationMuTextBox.TextChanged += new System.EventHandler(this.ThresholdInitializationMuTextBox_TextChanged);
    361365      //
    362366      // VariableConditionView
    363367      //
    364       this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
    365368      this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit;
    366369      this.Controls.Add(this.tabControl);

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

    r8099 r8103  
    5353
    5454    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);
     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);
    5959      foreach (var variable in variableNamesView.Content) {
    60         variable.ValueChanged += new EventHandler(variable_ValueChanged);
     60        variable.ValueChanged += new EventHandler(Variable_ValueChanged);
    6161      }
    6262    }
    6363
    6464    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);
     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);
    6969      foreach (var variable in variableNamesView.Content) {
    70         variable.ValueChanged -= new EventHandler(variable_ValueChanged);
     70        variable.ValueChanged -= new EventHandler(Variable_ValueChanged);
    7171      }
    7272    }
    … …  
    148148
    149149    #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);
     150    private void VariableNames_Changed(object sender, CollectionItemsChangedEventArgs<StringValue> e) {
     151      foreach (var newVar in e.Items)
     152        newVar.ValueChanged += new EventHandler(Variable_ValueChanged);
     153      foreach (var oldVar in e.OldItems)
     154        oldVar.ValueChanged -= new EventHandler(Variable_ValueChanged);
    157155      UpdateContent();
    158156    }
    159157
    160     private void variable_ValueChanged(object sender, EventArgs e) {
     158    private void Variable_ValueChanged(object sender, EventArgs e) {
    161159      UpdateContent();
    162160    }
    … …  
    170168    }
    171169
    172     private void thresholdMuTextBox_TextChanged(object sender, EventArgs e) {
     170    private void ThresholdInitializationMuTextBox_TextChanged(object sender, EventArgs e) {
    173171      double value;
    174172      if (double.TryParse(thresholdInitializationMuTextBox.Text, out value)) {
    … …  
    177175      } else errorProvider.SetError(thresholdInitializationMuTextBox, "Invalid value");
    178176    }
    179     private void thresholdInitializationSigmaTextBox_TextChanged(object sender, EventArgs e) {
     177    private void ThresholdInitializationSigmaTextBox_TextChanged(object sender, EventArgs e) {
    180178      double value;
    181179      if (double.TryParse(thresholdInitializationSigmaTextBox.Text, out value)) {
    … …  
    184182      } else errorProvider.SetError(thresholdInitializationSigmaTextBox, "Invalid value");
    185183    }
    186     private void slopeInitializationMuTextBox_TextChanged(object sender, EventArgs e) {
     184    private void SlopeInitializationMuTextBox_TextChanged(object sender, EventArgs e) {
    187185      double value;
    188186      if (double.TryParse(slopeInitializationMuTextBox.Text, out value)) {
    … …  
    191189      } else errorProvider.SetError(slopeInitializationMuTextBox, "Invalid value");
    192190    }
    193     private void slopeInitializationSigmaTextBox_TextChanged(object sender, EventArgs e) {
     191    private void SlopeInitializationSigmaTextBox_TextChanged(object sender, EventArgs e) {
    194192      double value;
    195193      if (double.TryParse(slopeInitializationSigmaTextBox.Text, out value)) {
    … …  
    199197    }
    200198
    201     private void thresholdChangeMuTextBox_TextChanged(object sender, EventArgs e) {
     199    private void ThresholdChangeMuTextBox_TextChanged(object sender, EventArgs e) {
    202200      double value;
    203201      if (double.TryParse(thresholdChangeMuTextBox.Text, out value)) {
    … …  
    207205    }
    208206
    209     private void thresholdChangeSigmaTextBox_TextChanged(object sender, EventArgs e) {
     207    private void ThresholdChangeSigmaTextBox_TextChanged(object sender, EventArgs e) {
    210208      double value;
    211209      if (double.TryParse(thresholdChangeSigmaTextBox.Text, out value)) {
    … …  
    214212      } else errorProvider.SetError(thresholdChangeSigmaTextBox, "Invalid value");
    215213    }
    216     private void slopeChangeMuTextBox_TextChanged(object sender, EventArgs e) {
     214    private void SlopeChangeMuTextBox_TextChanged(object sender, EventArgs e) {
    217215      double value;
    218216      if (double.TryParse(slopeChangeMuTextBox.Text, out value)) {
    … …  
    222220    }
    223221
    224     private void slopeChangeSigmaTextBox_TextChanged(object sender, EventArgs e) {
     222    private void SlopeChangeSigmaTextBox_TextChanged(object sender, EventArgs e) {
    225223      double value;
    226224      if (double.TryParse(slopeChangeSigmaTextBox.Text, out value)) {

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

    r7967 r8103  
    122122      this.toolTip.SetToolTip(this.weightInitializationMuTextBox, "The mu (mean) parameter of the normal distribution from which to sample the initi" +
    123123        "al weights.");
    124       this.weightInitializationMuTextBox.TextChanged += new System.EventHandler(this.weightMuTextBox_TextChanged);
     124      this.weightInitializationMuTextBox.TextChanged += new System.EventHandler(this.WeightMuTextBox_TextChanged);
    125125      //
    126126      // initializationGroupBox
    … …  
    159159      this.toolTip.SetToolTip(this.weightInitializationSigmaTextBox, "The sigma parameter for the normal distribution from which to sample the initial " +
    160160        "weights.");
    161       this.weightInitializationSigmaTextBox.TextChanged += new System.EventHandler(this.weightSigmaTextBox_TextChanged);
     161      this.weightInitializationSigmaTextBox.TextChanged += new System.EventHandler(this.WeightSigmaTextBox_TextChanged);
    162162      //
    163163      // mutationGroupBox
    … …  
    197197      this.toolTip.SetToolTip(this.multiplicativeWeightChangeSigmaTextBox, "The sigma (std.dev.) parameter for the normal distribution to sample a multiplica" +
    198198        "tive change in weight.");
    199       this.multiplicativeWeightChangeSigmaTextBox.TextChanged += new System.EventHandler(this.multiplicativeWeightChangeSigmaTextBox_TextChanged);
     199      this.multiplicativeWeightChangeSigmaTextBox.TextChanged += new System.EventHandler(this.MultiplicativeWeightChangeSigmaTextBox_TextChanged);
    200200      //
    201201      // additiveWeightChangeLabel
    … …  
    220220      this.toolTip.SetToolTip(this.additiveWeightChangeSigmaTextBox, "The sigma (std.dev.) parameter for the normal distribution to sample an additive " +
    221221        "change in weight.");
    222       this.additiveWeightChangeSigmaTextBox.TextChanged += new System.EventHandler(this.additiveWeightChangeSigmaTextBox_TextChanged);
     222      this.additiveWeightChangeSigmaTextBox.TextChanged += new System.EventHandler(this.AdditiveWeightChangeSigmaTextBox_TextChanged);
    223223      //
    224224      // tabControl

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

    r7869 r8103  
    5454
    5555    private void RegisterVariableNamesViewContentEvents() {
    56       variableNamesView.Content.ItemsAdded += new CollectionItemsChangedEventHandler<StringValue>(variableNames_Changed);
    57       variableNamesView.Content.ItemsRemoved += new CollectionItemsChangedEventHandler<StringValue>(variableNames_Changed);
    58       variableNamesView.Content.CheckedItemsChanged += new CollectionItemsChangedEventHandler<StringValue>(variableNames_Changed);
    59       variableNamesView.Content.CollectionReset += new CollectionItemsChangedEventHandler<StringValue>(variableNames_Changed);
     56      variableNamesView.Content.ItemsAdded += new CollectionItemsChangedEventHandler<StringValue>(VariableNames_Changed);
     57      variableNamesView.Content.ItemsRemoved += new CollectionItemsChangedEventHandler<StringValue>(VariableNames_Changed);
     58      variableNamesView.Content.CheckedItemsChanged += new CollectionItemsChangedEventHandler<StringValue>(VariableNames_Changed);
     59      variableNamesView.Content.CollectionReset += new CollectionItemsChangedEventHandler<StringValue>(VariableNames_Changed);
    6060      foreach (var variable in variableNamesView.Content) {
    61         variable.ValueChanged += new EventHandler(variable_ValueChanged);
     61        variable.ValueChanged += new EventHandler(Variable_ValueChanged);
    6262      }
    6363    }
    … …  
    6565
    6666    private void DeregisterVariableNamesViewContentEvents() {
    67       variableNamesView.Content.ItemsAdded -= new CollectionItemsChangedEventHandler<StringValue>(variableNames_Changed);
    68       variableNamesView.Content.ItemsRemoved -= new CollectionItemsChangedEventHandler<StringValue>(variableNames_Changed);
    69       variableNamesView.Content.CheckedItemsChanged -= new CollectionItemsChangedEventHandler<StringValue>(variableNames_Changed);
    70       variableNamesView.Content.CollectionReset -= new CollectionItemsChangedEventHandler<StringValue>(variableNames_Changed);
     67      variableNamesView.Content.ItemsAdded -= new CollectionItemsChangedEventHandler<StringValue>(VariableNames_Changed);
     68      variableNamesView.Content.ItemsRemoved -= new CollectionItemsChangedEventHandler<StringValue>(VariableNames_Changed);
     69      variableNamesView.Content.CheckedItemsChanged -= new CollectionItemsChangedEventHandler<StringValue>(VariableNames_Changed);
     70      variableNamesView.Content.CollectionReset -= new CollectionItemsChangedEventHandler<StringValue>(VariableNames_Changed);
    7171      foreach (var variable in variableNamesView.Content) {
    72         variable.ValueChanged -= new EventHandler(variable_ValueChanged);
     72        variable.ValueChanged -= new EventHandler(Variable_ValueChanged);
    7373      }
    7474    }
    … …  
    109109
    110110    #region control event handlers
    111     private void variableNames_Changed(object sender, CollectionItemsChangedEventArgs<StringValue> args) {
    112       if (args.Items != null)
    113         foreach (var newVar in args.Items)
    114           newVar.ValueChanged += new EventHandler(variable_ValueChanged);
    115       if (args.OldItems != null)
    116         foreach (var oldVar in args.OldItems)
    117           oldVar.ValueChanged -= new EventHandler(variable_ValueChanged);
     111    private void VariableNames_Changed(object sender, CollectionItemsChangedEventArgs<StringValue> e) {
     112      foreach (var newVar in e.Items)
     113        newVar.ValueChanged += new EventHandler(Variable_ValueChanged);
     114      foreach (var oldVar in e.OldItems)
     115        oldVar.ValueChanged -= new EventHandler(Variable_ValueChanged);
    118116      UpdateContent();
    119117    }
    120118
    121     private void variable_ValueChanged(object sender, EventArgs e) {
     119    private void Variable_ValueChanged(object sender, EventArgs e) {
    122120      UpdateContent();
    123121    }
    … …  
    131129    }
    132130
    133     private void weightMuTextBox_TextChanged(object sender, EventArgs e) {
     131    private void WeightMuTextBox_TextChanged(object sender, EventArgs e) {
    134132      double nu;
    135133      if (double.TryParse(weightInitializationMuTextBox.Text, out nu)) {
    … …  
    140138      }
    141139    }
    142     private void weightSigmaTextBox_TextChanged(object sender, EventArgs e) {
     140    private void WeightSigmaTextBox_TextChanged(object sender, EventArgs e) {
    143141      double sigma;
    144142      if (double.TryParse(weightInitializationSigmaTextBox.Text, out sigma) && sigma >= 0.0) {
    … …  
    150148    }
    151149
    152     private void additiveWeightChangeSigmaTextBox_TextChanged(object sender, EventArgs e) {
     150    private void AdditiveWeightChangeSigmaTextBox_TextChanged(object sender, EventArgs e) {
    153151      double sigma;
    154152      if (double.TryParse(additiveWeightChangeSigmaTextBox.Text, out sigma) && sigma >= 0.0) {
    … …  
    159157      }
    160158    }
    161     private void multiplicativeWeightChangeSigmaTextBox_TextChanged(object sender, EventArgs e) {
     159    private void MultiplicativeWeightChangeSigmaTextBox_TextChanged(object sender, EventArgs e) {
    162160      double sigma;
    163161      if (double.TryParse(multiplicativeWeightChangeSigmaTextBox.Text, out sigma) && sigma >= 0.0) {
Note: See TracChangeset for help on using the changeset viewer.