Changeset 4888 for trunk/sources/HeuristicLab.Optimization

Timestamp:

11/22/10 01:26:55 (14 years ago)

Author:

swagner

Message:

Trivial changes due to review of r4883 (#1284)

File:

• trunk/sources/HeuristicLab.Optimization/3.3/RunCollection.cs (modified) (5 diffs)

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

@@ -37 +37 @@
 
     [StorableConstructor]
-    protected RunCollection(bool deserializing) : base(deserializing) { }
-
+    protected RunCollection(bool deserializing)
+      : base(deserializing) {
+      updateOfRunsInProgress = false;
+    }
     protected RunCollection(RunCollection original, Cloner cloner)
       : base(original, cloner) {
+      updateOfRunsInProgress = false;
       resultNames = new List<string>(original.resultNames);
       parameterNames = new List<string>(original.parameterNames);
@@ -55 +58 @@
       UpdateFiltering(true);
     }
-    public override IDeepCloneable Clone(Cloner cloner) {
-      return new RunCollection(this, cloner);
-    }
     public RunCollection() : base() { Initialize(); }
     public RunCollection(int capacity) : base(capacity) { Initialize(); }
     public RunCollection(IEnumerable<IRun> collection) : base(collection) { Initialize(); this.OnItemsAdded(collection); }
     private void Initialize() {
+      updateOfRunsInProgress = false;
       parameterNames = new List<string>();
       resultNames = new List<string>();
@@ -81 +82 @@
     public RunCollectionConstraintCollection Constraints {
       get { return constraints; }
+    }
+
+    private bool updateOfRunsInProgress;
+    public bool UpdateOfRunsInProgress {
+      get { return updateOfRunsInProgress; }
+      set {
+        if (updateOfRunsInProgress != value) {
+          updateOfRunsInProgress = value;
+          OnUpdateOfRunsInProgressChanged();
+        }
+      }
+    }
+
+    [StorableHook(HookType.AfterDeserialization)]
+    private void AfterDeserialization() {
+      if (constraints == null) constraints = new RunCollectionConstraintCollection();
+      RegisterConstraintsEvents();
+      RegisterConstraintEvents(constraints);
+      UpdateFiltering(true);
+    }
+
+    public override IDeepCloneable Clone(Cloner cloner) {
+      return new RunCollection(this, cloner);
+    }
+
+    public event EventHandler UpdateOfRunsInProgressChanged;
+    protected virtual void OnUpdateOfRunsInProgressChanged() {
+      var handler = UpdateOfRunsInProgressChanged;
+      if (handler != null) handler(this, EventArgs.Empty);
     }
 
@@ -188 +218 @@
         value = run.Results[columnName];
       return value;
-    }
-
-    [StorableHook(HookType.AfterDeserialization)]
-    private void AfterDeserialization() {
-      if (constraints == null) constraints = new RunCollectionConstraintCollection();
-      RegisterConstraintsEvents();
-      RegisterConstraintEvents(constraints);
-      UpdateFiltering(true);
     }
 
@@ -285 +307 @@
     #endregion
 
-    #region
-    public event EventHandler<EventArgs<bool>> UpdateOfRunsInProgress;
-    public void OnUpdateOfRunsInProgress(bool inProgress) {
-      var handler = UpdateOfRunsInProgress;
-      if (handler != null) handler(this, new EventArgs<bool>(inProgress));
-    }
-    #endregion
-
-    #region filtering
+    #region Filtering
     private void UpdateFiltering(bool reset) {
-      OnUpdateOfRunsInProgress(true);
+      UpdateOfRunsInProgress = true;
       if (reset)
         list.ForEach(r => r.Visible = true);
       foreach (IRunCollectionConstraint constraint in this.constraints)
         constraint.Check();
-      OnUpdateOfRunsInProgress(false);
+      UpdateOfRunsInProgress = false;
     }