Changeset 2325 for trunk/sources/HeuristicLab.SparseMatrix

Timestamp:

09/02/09 12:03:13 (15 years ago)

Author:

mkommend

Message:

changed SparseMatrix.Matrix and MatrixRow to a generic type (ticket #701)

Location:

trunk/sources/HeuristicLab.SparseMatrix/3.2

Files:

• Matrix.cs (modified) (1 diff)
• MatrixRow.cs (modified) (1 diff)

trunk/sources/HeuristicLab.SparseMatrix/3.2/Matrix.cs

@@ -25 +25 @@
 
 namespace HeuristicLab.SparseMatrix {   
-  public class Matrix : ItemBase {
+  public class Matrix<KeyType,ValueType> : ItemBase {
     public Matrix() {
-      this.rows = new List<MatrixRow>();
+      this.rows = new List<MatrixRow<KeyType,ValueType>>();
     }
 
-    public Matrix(IEnumerable<MatrixRow> rows)
+    public Matrix(IEnumerable<MatrixRow<KeyType,ValueType>> rows)
       : this() {
       this.rows.AddRange(rows);
     }
 
-    private List<MatrixRow> rows;
-    public ReadOnlyCollection<MatrixRow> GetRows() {
+    private List<MatrixRow<KeyType, ValueType>> rows;
+    public ReadOnlyCollection<MatrixRow<KeyType, ValueType>> GetRows() {
       return rows.AsReadOnly();
     }
 
-    public void AddRow(MatrixRow row) {
+    public void AddRow(MatrixRow<KeyType, ValueType> row) {
       this.rows.Add(row);
     }
 
-    public void RemoveRow(MatrixRow row) {
+    public void RemoveRow(MatrixRow<KeyType, ValueType> row) {
       this.rows.Remove(row);
     }

trunk/sources/HeuristicLab.SparseMatrix/3.2/MatrixRow.cs

@@ -23 +23 @@
 
 namespace HeuristicLab.SparseMatrix {
-  public class MatrixRow {
-    private Dictionary<string, object> values;
+  public class MatrixRow<KeyType, ValueType> {
+    private Dictionary<KeyType, ValueType> values;
     public MatrixRow() {
-      values = new Dictionary<string, object>();
-    } 
-
-    public void Set(string name, object value) {
-      values.Add(name, value);
+      values = new Dictionary<KeyType, ValueType>();
     }
 
-    public object Get(string name) {
-      if (name == null || !values.ContainsKey(name)) return null;
-      return values[name];
+    public void Set(KeyType key, ValueType value) {
+      values.Add(key, value);
     }
 
-    public IEnumerable<KeyValuePair<string, object>> Values {
+    public bool ContainsKey(KeyType key) {
+      return values.ContainsKey(key);
+    }
+
+    public ValueType Get(KeyType key) {
+      if (key == null || !values.ContainsKey(key)) return default(ValueType);
+      return values[key];
+    }
+
+    public IEnumerable<KeyValuePair<KeyType, ValueType>> Values {
       get { return values; }
     }