Changeset 3308 for trunk/sources/HeuristicLab.Data

Timestamp:

04/12/10 14:14:39 (14 years ago)

Author:

mkommend

Message:

added ColumnNames property in IStringConvertibleMatrix and in classes implementing this interface (ticket #968)

Location:

trunk/sources/HeuristicLab.Data/3.3

Files:

• BoolMatrix.cs (modified) (2 diffs)
• DoubleMatrix.cs (modified) (2 diffs)
• IStringConvertibleMatrix.cs (modified) (2 diffs)
• IntMatrix.cs (modified) (2 diffs)
• StringMatrix.cs (modified) (6 diffs)
• ValueTypeMatrix.cs (modified) (3 diffs)

trunk/sources/HeuristicLab.Data/3.3/BoolMatrix.cs

@@ -20 +20 @@
 #endregion
 
+using System.Collections.Generic;
 using System.Text;
 using HeuristicLab.Core;
@@ -73 +74 @@
       set { Columns = value; }
     }
+    IEnumerable<string> IStringConvertibleMatrix.ColumnNames {
+      get { return this.ColumnNames; }
+      set { this.ColumnNames = value; }
+    }
     bool IStringConvertibleMatrix.Validate(string value, out string errorMessage) {
       return Validate(value, out errorMessage);

trunk/sources/HeuristicLab.Data/3.3/DoubleMatrix.cs

@@ -20 +20 @@
 #endregion
 
+using System.Collections.Generic;
 using System.Text;
 using HeuristicLab.Core;
@@ -73 +74 @@
       set { Columns = value; }
     }
+    IEnumerable<string> IStringConvertibleMatrix.ColumnNames {
+      get { return this.ColumnNames; }
+      set { this.ColumnNames = value; }
+    }
     bool IStringConvertibleMatrix.Validate(string value, out string errorMessage) {
       return Validate(value, out errorMessage);

trunk/sources/HeuristicLab.Data/3.3/IStringConvertibleMatrix.cs

@@ -22 +22 @@
 using System;
 using HeuristicLab.Common;
+using System.Collections.Generic;
 
 namespace HeuristicLab.Data {
@@ -27 +28 @@
     int Rows { get; set; }
     int Columns { get; set; }
+
+    IEnumerable<string> ColumnNames { get; set; }
+    //bool SortableView { get; }
 
     bool Validate(string value, out string errorMessage);

trunk/sources/HeuristicLab.Data/3.3/IntMatrix.cs

@@ -20 +20 @@
 #endregion
 
+using System.Collections.Generic;
 using System.Text;
 using HeuristicLab.Core;
@@ -73 +74 @@
       set { Columns = value; }
     }
+    IEnumerable<string> IStringConvertibleMatrix.ColumnNames {
+      get { return this.ColumnNames; }
+      set { this.ColumnNames = value; }
+    }
     bool IStringConvertibleMatrix.Validate(string value, out string errorMessage) {
       return Validate(value, out errorMessage);

trunk/sources/HeuristicLab.Data/3.3/StringMatrix.cs

@@ -22 +22 @@
 using System;
 using System.Collections;
+using System.Collections.Generic;
 using System.Drawing;
+using System.Linq;
 using System.Text;
 using HeuristicLab.Common;
@@ -38 +40 @@
     [Storable]
     protected string[,] matrix;
+
+    [Storable]
+    protected List<string> columnNames;
+    public IEnumerable<string> ColumnNames {
+      get { return this.columnNames; }
+      set {
+        if (value == null || value.Count() == 0)
+          columnNames = new List<string>();
+        else if (value.Count() != Columns)
+          throw new ArgumentException("A columnName must be for each column specified.");
+        else
+          columnNames = new List<string>(value);
+      }
+    }
 
     public virtual int Rows {
@@ -76 +92 @@
     public StringMatrix() {
       matrix = new string[0, 0];
+      columnNames = new List<string>();
     }
     public StringMatrix(int rows, int columns) {
@@ -83 +100 @@
           matrix[i, j] = string.Empty;
       }
+      columnNames = new List<string>();
+    }
+    protected StringMatrix(int rows, int columns, IEnumerable<string> columnNames)
+      : this(rows, columns) {
+      ColumnNames = columnNames;
     }
     public StringMatrix(string[,] elements) {
@@ -91 +113 @@
           matrix[i, j] = elements[i, j] == null ? string.Empty : elements[i, j];
       }
+      columnNames = new List<string>();
+    }
+    protected StringMatrix(string[,] elements, IEnumerable<string> columnNames)
+      : this(elements) {
+      ColumnNames = columnNames;
     }
 
@@ -162 +189 @@
       set { Columns = value; }
     }
+    IEnumerable<string> IStringConvertibleMatrix.ColumnNames {
+      get { return this.ColumnNames; }
+      set { this.ColumnNames = value; }
+    }
     bool IStringConvertibleMatrix.Validate(string value, out string errorMessage) {
       return Validate(value, out errorMessage);

trunk/sources/HeuristicLab.Data/3.3/ValueTypeMatrix.cs

@@ -22 +22 @@
 using System;
 using System.Collections;
+using System.Collections.Generic;
 using System.Drawing;
+using System.Linq;
 using System.Text;
 using HeuristicLab.Common;
@@ -38 +40 @@
     [Storable]
     protected T[,] matrix;
+
+    [Storable]
+    protected List<string> columnNames;
+    public IEnumerable<string> ColumnNames {
+      get { return this.columnNames; }
+      set {
+        if (value == null || value.Count() == 0)
+          columnNames = new List<string>();
+        else if (value.Count() != Columns)
+          throw new ArgumentException("A columnName must be for each column specified.");
+        else
+          columnNames = new List<string>(value);
+      }
+    }
 
     public virtual int Rows {
@@ -74 +90 @@
     protected ValueTypeMatrix() {
       matrix = new T[0, 0];
+      columnNames = new List<string>();
     }
     protected ValueTypeMatrix(int rows, int columns) {
       matrix = new T[rows, columns];
+      columnNames = new List<string>();
+    }
+    protected ValueTypeMatrix(int rows, int columns, IEnumerable<string> columnNames)
+      : this(rows, columns) {
+      ColumnNames = columnNames;
     }
     protected ValueTypeMatrix(T[,] elements) {
       if (elements == null) throw new ArgumentNullException();
       matrix = (T[,])elements.Clone();
+      columnNames = new List<string>();
+    }
+    protected ValueTypeMatrix(T[,] elements, IEnumerable<string> columnNames)
+      : this(elements) {
+      ColumnNames = columnNames;
     }