Changeset 5150 for trunk/sources/HeuristicLab.Optimization/3.3/RunCollection.cs

Timestamp:

12/21/10 16:08:55 (14 years ago)

Author:

mkommend

Message:

Added ColumnsChanged and RowsChanged event in IStringConvertibleMatrix and all implementing classes (ticket #1269).

File:

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

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

@@ -123 +123 @@
       }
       columnNameCache = null;
+      OnColumnsChanged();
       OnColumnNamesChanged();
       rowNamesCache = null;
       base.OnCollectionReset(items, oldItems);
+      OnRowsChanged();
       OnRowNamesChanged();
       OnReset();
@@ -131 +133 @@
     }
     protected override void OnItemsAdded(IEnumerable<IRun> items) {
-      bool columnNamesChanged = false;
+      bool columnsChanged = false;
       foreach (IRun run in items) {
         foreach (KeyValuePair<string, IItem> parameter in run.Parameters)
-          columnNamesChanged |= AddParameter(parameter.Key, parameter.Value);
+          columnsChanged |= AddParameter(parameter.Key, parameter.Value);
         foreach (KeyValuePair<string, IItem> result in run.Results)
-          columnNamesChanged |= AddResult(result.Key, result.Value);
-      }
-      if (columnNamesChanged) columnNameCache = null;
+          columnsChanged |= AddResult(result.Key, result.Value);
+      }
+      if (columnsChanged) columnNameCache = null;
       rowNamesCache = null;
       base.OnItemsAdded(items);
       OnReset();
+      OnRowsChanged();
       OnRowNamesChanged();
-      if (columnNamesChanged) OnColumnNamesChanged();
+      if (columnsChanged) {
+        OnColumnsChanged();
+        OnColumnNamesChanged();
+      }
       UpdateFiltering(false);
     }
     protected override void OnItemsRemoved(IEnumerable<IRun> items) {
-      bool columnNamesChanged = false;
+      bool columnsChanged = false;
       foreach (IRun run in items) {
         foreach (string parameterName in run.Parameters.Keys)
-          columnNamesChanged |= RemoveParameterName(parameterName);
+          columnsChanged |= RemoveParameterName(parameterName);
         foreach (string resultName in run.Results.Keys)
-          columnNamesChanged |= RemoveResultName(resultName);
-      }
-      if (columnNamesChanged) columnNameCache = null;
+          columnsChanged |= RemoveResultName(resultName);
+      }
+      if (columnsChanged) columnNameCache = null;
       rowNamesCache = null;
       base.OnItemsRemoved(items);
       OnReset();
       OnRowNamesChanged();
-      if (columnNamesChanged) OnColumnNamesChanged();
+      if (columnsChanged) {
+        OnColumnsChanged();
+        OnColumnNamesChanged();
+      }
     }
 
@@ -287 +296 @@
       OnToStringChanged();
     }
+    public event EventHandler ColumnsChanged;
+    protected virtual void OnColumnsChanged() {
+      var handler = ColumnsChanged;
+      if (handler != null) handler(this, EventArgs.Empty);
+    }
+    public event EventHandler RowsChanged;
+    protected virtual void OnRowsChanged() {
+      var handler = RowsChanged;
+      if (handler != null) handler(this, EventArgs.Empty);
+    }
     public event EventHandler ColumnNamesChanged;
     protected virtual void OnColumnNamesChanged() {