Changeset 3321

Timestamp:

04/13/10 10:37:47 (15 years ago)

Author:

mkommend

Message:

adapted dataset to new IStringConvertibleMatrix interface (ticket #938)

File:

• trunk/sources/HeuristicLab.Problems.DataAnalysis/3.3/Dataset.cs (modified) (9 diffs)

trunk/sources/HeuristicLab.Problems.DataAnalysis/3.3/Dataset.cs

@@ -46 +46 @@
       }
       Data = data;
-      this.variableNames = variableNames.ToArray();
+      this.VariableNames = variableNames;
+      this.sortableView = false;
     }
 
@@ -53 +54 @@
     public IEnumerable<string> VariableNames {
       get { return variableNames; }
+      protected set {
+        if (variableNames != value) {
+          variableNames = value.ToArray();
+          OnColumnNamesChanged();
+        }
+      }
     }
 
@@ -75 +82 @@
           data[rowIndex, columnIndex] = value;
           OnDataChanged(new EventArgs<int, int>(rowIndex, columnIndex));
+          OnItemChanged(rowIndex, columnIndex);
         }
       }
@@ -116 +124 @@
       if (variableIndex < 0 || variableIndex >= variableNames.Length) throw new ArgumentException(" Cannot set name of not existent variable at index " + variableIndex + ".");
       variableNames[variableIndex] = name;
+      OnColumnNamesChanged();
     }
 
@@ -220 +229 @@
       var listeners = Reset;
       if (listeners != null) listeners(this, e);
-    }
-
-    private void data_ItemChanged(object sender, EventArgs<int, int> e) {
-      OnDataChanged(e);
-    }
-
-    private void data_Reset(object sender, EventArgs e) {
-      OnReset(e);
     }
     #endregion
@@ -271 +272 @@
               newVariableNames[column] = "Var" + column.ToString(formatString);
           }
-          variableNames = newVariableNames;
+          VariableNames = newVariableNames;
           Data = newValues;
+        }
+      }
+    }
+
+    [Storable]
+    private bool sortableView;
+    public bool SortableView {
+      get { return sortableView; }
+      set {
+        if (value != sortableView) {
+          sortableView = value;
+          OnSortableViewChanged();
         }
       }
@@ -285 +298 @@
           i++;
         }
+        OnColumnNamesChanged();
       }
     }
@@ -294 +308 @@
 
     public bool Validate(string value, out string errorMessage) {
+      double val;
+      bool valid = double.TryParse(value, out val);
       errorMessage = string.Empty;
-      return true;
+      if (!valid) {
+        StringBuilder sb = new StringBuilder();
+        sb.Append("Invalid Value (Valid Value Format: \"");
+        sb.Append(FormatPatterns.GetDoubleFormatPattern());
+        sb.Append("\")");
+        errorMessage = sb.ToString();
+      }
+      return valid;
     }
 
@@ -306 +329 @@
       if (double.TryParse(value, out v)) {
         data[rowIndex, columnIndex] = v;
+        OnDataChanged(new EventArgs<int, int>(rowIndex, columnIndex));
+        OnItemChanged(rowIndex, columnIndex);
         return true;
       } else return false;
     }
 
+    public event EventHandler ColumnNamesChanged;
+    private void OnColumnNamesChanged() {
+      EventHandler handler = ColumnNamesChanged;
+      if (handler != null)
+        handler(this, EventArgs.Empty);
+    }
+    public event EventHandler RowNamesChanged;
+    private void OnRowNamesChanged() {
+      EventHandler handler = RowNamesChanged;
+      if (handler != null)
+        handler(this, EventArgs.Empty);
+    }
+    public event EventHandler SortableViewChanged;
+    private void OnSortableViewChanged() {
+      EventHandler handler = SortableViewChanged;
+      if (handler != null)
+        handler(this, EventArgs.Empty);
+    }
     public event EventHandler<EventArgs<int, int>> ItemChanged;
+    private void OnItemChanged(int rowIndex, int columnIndex) {
+      if (ItemChanged != null)
+        ItemChanged(this, new EventArgs<int, int>(rowIndex, columnIndex));
+      OnToStringChanged();
+    }
     #endregion
   }