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

Timestamp:

03/05/13 16:37:17 (11 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/IntMatrix.cs (modified) (6 diffs)

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

@@ -20 +20 @@
 #endregion
 
+using System;
 using System.Collections.Generic;
+using System.Linq;
 using System.Text;
 using HeuristicLab.Common;
@@ -29 +31 @@
   [Item("IntMatrix", "Represents a matrix of integer values.")]
   [StorableClass]
-  public class IntMatrix : ValueTypeMatrix<int>, IStringConvertibleMatrix {
+  public class IntMatrix : ValueTypeMatrix<int> {
     [StorableConstructor]
     protected IntMatrix(bool deserializing) : base(deserializing) { }
@@ -38 +40 @@
     public IntMatrix(int rows, int columns) : base(rows, columns) { }
     public IntMatrix(int rows, int columns, IEnumerable<string> columnNames) : base(rows, columns, columnNames) { }
-    public IntMatrix(int rows, int columns, IEnumerable<string> columnNames,IEnumerable<string> rowNames) : base(rows, columns, columnNames,rowNames) { }
+    public IntMatrix(int rows, int columns, IEnumerable<string> columnNames, IEnumerable<string> rowNames) : base(rows, columns, columnNames, rowNames) { }
     public IntMatrix(int[,] elements) : base(elements) { }
-    public IntMatrix(int[,] elements, IEnumerable<string> columnNames) : base(elements,columnNames) { }
-    public IntMatrix(int[,] elements, IEnumerable<string> columnNames, IEnumerable<string> rowNames) : base(elements,columnNames,rowNames) { }
+    public IntMatrix(int[,] elements, IEnumerable<string> columnNames) : base(elements, columnNames) { }
+    public IntMatrix(int[,] elements, IEnumerable<string> columnNames, IEnumerable<string> rowNames) : base(elements, columnNames, rowNames) { }
 
     public override IDeepCloneable Clone(Cloner cloner) {
@@ -47 +49 @@
     }
 
-    protected virtual bool Validate(string value, out string errorMessage) {
+    protected override bool Validate(string value, out string errorMessage) {
       int val;
       bool valid = int.TryParse(value, out val);
@@ -60 +62 @@
       return valid;
     }
-    protected virtual string GetValue(int rowIndex, int columIndex) {
+    protected override string GetValue(int rowIndex, int columIndex) {
       return this[rowIndex, columIndex].ToString();
     }
-    protected virtual bool SetValue(string value, int rowIndex, int columnIndex) {
+    protected override bool SetValue(string value, int rowIndex, int columnIndex) {
       int val;
       if (int.TryParse(value, out val)) {
@@ -72 +74 @@
       }
     }
-
-    #region IStringConvertibleMatrix Members
-    int IStringConvertibleMatrix.Rows {
-      get { return Rows; }
-      set { Rows = value; }
+    protected override bool SetValue(IEnumerable<RowColumnValue> rowColumnValues) {
+      if (ReadOnly) throw new NotSupportedException("Item cannot be set. StringMatrix is read-only.");
+      List<Tuple<Position, int>> newValues = new List<Tuple<Position, int>>();
+      int parsed;
+      foreach (var curValue in rowColumnValues) {
+        if (int.TryParse(curValue.Value, out parsed)) {
+          newValues.Add(new Tuple<Position, int>(curValue.Position, parsed));
+        } else {
+          return false;
+        }
+      }
+      Position pos;
+      foreach (var curValue in newValues) {
+        pos = curValue.Item1;
+        matrix[pos.Row, pos.Column] = curValue.Item2;
+      }
+      OnItemsChanged(rowColumnValues.Select(x => x.Position));
+      return true;
     }
-    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 columIndex) {
-      return GetValue(rowIndex, columIndex);
-    }
-    bool IStringConvertibleMatrix.SetValue(string value, int rowIndex, int columnIndex) {
-      return SetValue(value, rowIndex, columnIndex);
-    }
-    #endregion
   }
 }