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/VariableView.cs

    r8085 r8206  
    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.