Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
07/03/12 16:46:35 (13 years ago)
Author:
gkronber
Message:

#1847: merged r8084:8205 from trunk into GP move operators branch

Location:
branches/GP-MoveOperators
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • branches/GP-MoveOperators

  • branches/GP-MoveOperators/HeuristicLab.Problems.DataAnalysis.Symbolic.Views/3.4/Symbols/VariableConditionView.cs

    r8085 r8206  
    3535  [Content(typeof(VariableCondition), true)]
    3636  public partial class VariableConditionView : SymbolView {
    37     private CheckedItemCollectionView<StringValue> variableNamesView;
     37    private readonly CheckedItemCollectionView<StringValue> variableNamesView;
    3838
    3939    public new VariableCondition Content {
    … …  
    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)) {
Note: See TracChangeset for help on using the changeset viewer.