Changeset 9286 for branches/ImprovingStringConvertibleMatrix/HeuristicLab.Data/3.3/ValueTypeMatrix.cs

Timestamp:

03/05/13 16:37:17 (12 years ago)

Author:

sforsten

Message:

#2018:

• added new methods to the interface IStringConvertibleMatrix as well as two structs. Also the event ItemChanged has been changed to ItemsChanged
• class ValueTypeMatrix now implements IStringConvertibleMatrix instead of the classes which inherit from it
• small changes have been applied to a lot of classes to correctly implement the changed interface IStringConvertibleMatrix
• solution file, Build.cmd and PreBuildEvent.cmd have been added

Location:

branches/ImprovingStringConvertibleMatrix

Files:

• . (modified) (1 prop)
• HeuristicLab.Data/3.3/ValueTypeMatrix.cs (modified) (4 diffs)

branches/ImprovingStringConvertibleMatrix/HeuristicLab.Data/3.3/ValueTypeMatrix.cs

@@ -33 +33 @@
   [Item("ValueTypeMatrix", "An abstract base class for representing matrices of value types.")]
   [StorableClass]
-  public abstract class ValueTypeMatrix<T> : Item, IEnumerable<T> where T : struct {
+  public abstract class ValueTypeMatrix<T> : Item, IEnumerable<T>, IStringConvertibleMatrix where T : struct {
     public static new Image StaticItemImage {
       get { return HeuristicLab.Common.Resources.VSImageLibrary.Class; }
@@ -127 +127 @@
         if (!value.Equals(matrix[rowIndex, columnIndex])) {
           matrix[rowIndex, columnIndex] = value;
-          OnItemChanged(rowIndex, columnIndex);
+          OnItemsChanged(new List<Position>(1) { new Position(rowIndex, columnIndex) });
         }
       }
@@ -247 +247 @@
         handler(this, EventArgs.Empty);
     }
-    public event EventHandler<EventArgs<int, int>> ItemChanged;
-    protected virtual void OnItemChanged(int rowIndex, int columnIndex) {
-      if (ItemChanged != null)
-        ItemChanged(this, new EventArgs<int, int>(rowIndex, columnIndex));
+    public event EventHandler<EventArgs<IEnumerable<Position>>> ItemsChanged;
+    protected virtual void OnItemsChanged(IEnumerable<Position> positions) {
+      if (ItemsChanged != null)
+        ItemsChanged(this, new EventArgs<IEnumerable<Position>>(positions));
       OnToStringChanged();
     }
@@ -260 +260 @@
     }
     #endregion
+
+    protected abstract bool Validate(string value, out string errorMessage);
+    protected abstract bool SetValue(string value, int rowIndex, int columnIndex);
+    protected abstract string GetValue(int rowIndex, int columIndex);
+    protected abstract bool SetValue(IEnumerable<RowColumnValue> rowColumnValues);
+
+    #region IStringConvertibleMatrix Members
+    int IStringConvertibleMatrix.Rows {
+      get { return Rows; }
+      set { Rows = value; }
+    }
+    int IStringConvertibleMatrix.Columns {
+      get { return Columns; }
+      set { Columns = value; }
+    }
+
+    bool IStringConvertibleMatrix.Validate(string value, out string errorMessage) {
+      return Validate(value, out errorMessage);
+    }
+    string IStringConvertibleMatrix.GetValue(int rowIndex, int columnIndex) {
+      return GetValue(rowIndex, columnIndex);
+    }
+    bool IStringConvertibleMatrix.SetValue(string value, int rowIndex, int columnIndex) {
+      return SetValue(value, rowIndex, columnIndex);
+    }
+
+    bool IStringConvertibleMatrix.SetValue(RowColumnValue rowColumnValue) {
+      return SetValue(rowColumnValue.Value, rowColumnValue.Position.Row, rowColumnValue.Position.Column);
+    }
+
+    bool IStringConvertibleMatrix.SetValue(IEnumerable<RowColumnValue> rowColumnValues) {
+      return SetValue(rowColumnValues);
+    }
+    #endregion
   }
 }