Changeset 3632 for trunk/sources/HeuristicLab.Optimization

Timestamp:

05/05/10 14:04:53 (15 years ago)

Author:

mkommend

Message:

corrected RunCollectionConstraints and the according views (ticket#970)

Location:

trunk/sources/HeuristicLab.Optimization/3.3

Files:

• RunCollection.cs (modified) (6 diffs)
• RunCollectionConstraints/RunCollectionComparisonConstraint.cs (modified) (1 diff)
• RunCollectionConstraints/RunCollectionTypeCompatiblityConstraint.cs (modified) (1 diff)

trunk/sources/HeuristicLab.Optimization/3.3/RunCollection.cs

@@ -84 +84 @@
         OnColumnNamesChanged();
       OnRowNamesChanged();
+      this.UpdateFiltering(false);
     }
     protected override void OnItemsRemoved(IEnumerable<IRun> items) {
@@ -160 +161 @@
     public override IDeepCloneable Clone(Cloner cloner) {
       RunCollection clone = (RunCollection)base.Clone(cloner);
-      clone.resultNames = this.resultNames;
-      clone.parameterNames = this.parameterNames;
+      clone.resultNames = new List<string>(this.resultNames);
+      clone.parameterNames = new List<string>(this.parameterNames);
       clone.dataTypes = new Dictionary<string, HashSet<Type>>();
       foreach (string s in this.dataTypes.Keys)
         clone.dataTypes[s] = new HashSet<Type>(this.dataTypes[s]);
-
       return clone;
     }
@@ -252 +252 @@
 
     #region filtering
-    private void UpdateFiltering() {
-      list.ForEach(r => r.Visible = true);
+    private void UpdateFiltering(bool reset) {
+      if (reset)
+        list.ForEach(r => r.Visible = true);
       foreach (IRunCollectionConstraint constraint in this.constraints)
         constraint.Check();
@@ -278 +279 @@
       DeregisterConstraintEvents(e.OldItems);
       RegisterConstraintEvents(e.Items);
-      this.UpdateFiltering();
+      this.UpdateFiltering(true);
     }
     protected virtual void Constraints_ItemsAdded(object sender, CollectionItemsChangedEventArgs<IRunCollectionConstraint> e) {
@@ -284 +285 @@
       foreach (IRunCollectionConstraint constraint in e.Items)
         constraint.ConstrainedValue = this;
-      this.UpdateFiltering();
+      this.UpdateFiltering(false);
     }
     protected virtual void Constraints_ItemsRemoved(object sender, CollectionItemsChangedEventArgs<IRunCollectionConstraint> e) {
       DeregisterConstraintEvents(e.Items);
-      this.UpdateFiltering();
+      this.UpdateFiltering(true);
     }
     protected virtual void Constraint_ActiveChanged(object sender, EventArgs e) {
-      this.UpdateFiltering();
+      IRunCollectionConstraint constraint = (IRunCollectionConstraint)sender;
+      this.UpdateFiltering(!constraint.Active);
     }
     protected virtual void Constraint_ConstrainedValueChanged(object sender, EventArgs e) {
@@ -297 +299 @@
     }
     protected virtual void Constraint_ConstraintOperationChanged(object sender, EventArgs e) {
-      this.UpdateFiltering();
+      IRunCollectionConstraint constraint = (IRunCollectionConstraint)sender;
+      if (constraint.Active)
+        this.UpdateFiltering(true);
     }
     protected virtual void Constraint_ConstraintDataChanged(object sender, EventArgs e) {
-      this.UpdateFiltering();
+      IRunCollectionConstraint constraint = (IRunCollectionConstraint)sender;
+      if (constraint.Active)
+        this.UpdateFiltering(true);
     }
     #endregion

trunk/sources/HeuristicLab.Optimization/3.3/RunCollectionConstraints/RunCollectionComparisonConstraint.cs

@@ -70 +70 @@
           constraintColumn = value;
           this.OnConstraintColumnChanged();
+          this.OnToStringChanged();
         }
       }

trunk/sources/HeuristicLab.Optimization/3.3/RunCollectionConstraints/RunCollectionTypeCompatiblityConstraint.cs

@@ -60 +60 @@
           constraintColumn = value;
           this.OnConstraintColumnChanged();
+          this.OnToStringChanged();
         }
       }