Changeset 8915 for branches/HeuristicLab.TreeSimplifier/HeuristicLab.Problems.DataAnalysis.Symbolic.Views/3.4/Symbols/VariableConditionView.cs

Timestamp:

11/15/12 16:47:25 (11 years ago)

Author:

mkommend

Message:

#1763: merged changes from trunk into the tree simplifier branch.

File:

• branches/HeuristicLab.TreeSimplifier/HeuristicLab.Problems.DataAnalysis.Symbolic.Views/3.4/Symbols/VariableConditionView.cs (modified) (1 diff)

branches/HeuristicLab.TreeSimplifier/HeuristicLab.Problems.DataAnalysis.Symbolic.Views/3.4/Symbols/VariableConditionView.cs

@@ -124 +124 @@
         RegisterVariableNamesViewContentEvents();
       } else {
-        var existingEntries = variableNamesView.Content.ToList();
-
         // temporarily deregister to prevent circular calling of events
         DeregisterVariableNamesViewContentEvents();
-        // add additional entries
-        foreach (var variableName in Content.VariableNames.Except(existingEntries.Select(x => x.Value)))
-          variableNamesView.Content.Add(new StringValue(variableName), true);
-        foreach (var oldEntry in existingEntries.Where(x => !Content.VariableNames.Contains(x.Value)))
-          variableNamesView.Content.Remove(oldEntry);
+        variableNamesView.Content.Clear();
+        foreach (var variableName in Content.AllVariableNames) {
+          variableNamesView.Content.Add(new StringValue(variableName), Content.VariableNames.Contains(variableName));
+        }
         RegisterVariableNamesViewContentEvents();