Changeset 12725 for stable/HeuristicLab.Optimization/3.3

Timestamp:

07/11/15 13:37:32 (9 years ago)

Author:

ascheibe

Message:

#2270 and #2354: merged r12173, r12458, r12077, r12599, r12613, r12112, r12116, r12117, r12131, r12631, r12672, r12684, r12690, r12692 into stable

Location:

stable

Files:

• . (modified) (1 prop)
• HeuristicLab.Optimization (modified) (1 prop)
• HeuristicLab.Optimization/3.3/RunCollection.cs (modified) (6 diffs)

stable/HeuristicLab.Optimization/3.3/RunCollection.cs

@@ -445 +445 @@
       EventHandler<EventArgs<int, int>> handler = ItemChanged;
       if (handler != null) handler(this, new EventArgs<int, int>(rowIndex, columnIndex));
-      OnToStringChanged();
     }
     public event EventHandler Reset;
@@ -451 +450 @@
       EventHandler handler = Reset;
       if (handler != null) handler(this, EventArgs.Empty);
-      OnToStringChanged();
     }
     public event EventHandler ColumnsChanged;
@@ -485 +483 @@
     #region Filtering
     private void UpdateFiltering(bool reset) {
+      var oldUpateRuns = UpdateOfRunsInProgress;
       UpdateOfRunsInProgress = true;
       if (reset)
@@ -490 +489 @@
       foreach (IRunCollectionConstraint constraint in this.constraints)
         constraint.Check();
-      UpdateOfRunsInProgress = false;
+      UpdateOfRunsInProgress = oldUpateRuns;
     }
 
@@ -552 +551 @@
     #region Modification
     public void Modify() {
+      var oldUpateRuns = UpdateOfRunsInProgress;
       UpdateOfRunsInProgress = true;
       var runs = this.ToList();
@@ -566 +566 @@
         }
       }
-      UpdateOfRunsInProgress = false;
+      UpdateOfRunsInProgress = oldUpateRuns;
     }