Changeset 3308 for trunk/sources/HeuristicLab.Problems.DataAnalysis/3.3/Dataset.cs

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)

File:

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

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

@@ -45 +45 @@
         throw new ArgumentException("Number of variable names doesn't match the number of columns of data");
       }
-      Data = new DoubleMatrix(data);
-      this.variableNames = new StringArray(variableNames.ToArray());
+      Data = data;
+      this.variableNames = variableNames.ToArray();
     }
 
     [Storable]
-    private StringArray variableNames;
+    private string[] variableNames;
     public IEnumerable<string> VariableNames {
       get { return variableNames; }
@@ -56 +56 @@
 
     [Storable]
-    private DoubleMatrix data;
-    private DoubleMatrix Data {
+    private double[,] data;
+    private double[,] Data {
       get { return data; }
       set {
         if (data != value) {
           if (value == null) throw new ArgumentNullException();
-          if (data != null) DeregisterDataEvents();
           this.data = value;
-          RegisterDataEvents();
           OnReset(EventArgs.Empty);
         }
@@ -70 +68 @@
     }
 
-    private void RegisterDataEvents() {
-      data.Reset += new EventHandler(data_Reset);
-      data.ItemChanged += new EventHandler<EventArgs<int, int>>(data_ItemChanged);
-    }
-
-    private void DeregisterDataEvents() {
-      data.Reset -= new EventHandler(data_Reset);
-      data.ItemChanged -= new EventHandler<EventArgs<int, int>>(data_ItemChanged);
-    }
     // elementwise access
     public double this[int rowIndex, int columnIndex] {
@@ -91 +80 @@
     // access to full columns
     public double[] this[string variableName] {
-      get { return GetVariableValues(GetVariableIndex(variableName), 0, data.Rows); }
+      get { return GetVariableValues(GetVariableIndex(variableName), 0, Rows); }
     }
 
@@ -97 +86 @@
       if (start < 0 || !(start <= end))
         throw new ArgumentException("Start must be between 0 and end (" + end + ").");
-      if (end > data.Rows || end < start)
-        throw new ArgumentException("End must be between start (" + start + ") and dataset rows (" + data.Rows + ").");
+      if (end > Rows || end < start)
+        throw new ArgumentException("End must be between start (" + start + ") and dataset rows (" + Rows + ").");
 
       double[] values = new double[end - start];
@@ -123 +112 @@
 
     public void SetVariableName(int variableIndex, string name) {
+      if (name == null) throw new ArgumentNullException("Cannot set variable name to null for variable at index " + variableIndex + " variableIndex");
       if (variableNames.Contains(name)) throw new ArgumentException("The data set already contains a variable with name " + name + ".");
+      if (variableIndex < 0 || variableIndex >= variableNames.Length) throw new ArgumentException(" Cannot set name of not existent variable at index " + variableIndex + ".");
       variableNames[variableIndex] = name;
     }
@@ -139 +130 @@
 
     public double GetMean(int variableIndex) {
-      return GetMean(variableIndex, 0, data.Rows);
+      return GetMean(variableIndex, 0, Rows);
     }
 
@@ -151 +142 @@
 
     public double GetRange(int variableIndex) {
-      return GetRange(variableIndex, 0, data.Rows);
+      return GetRange(variableIndex, 0, Rows);
     }
 
@@ -168 +159 @@
 
     public double GetMax(int variableIndex) {
-      return GetMax(variableIndex, 0, data.Rows);
+      return GetMax(variableIndex, 0, Rows);
     }
 
@@ -184 +175 @@
 
     public double GetMin(int variableIndex) {
-      return GetMin(variableIndex, 0, data.Rows);
+      return GetMin(variableIndex, 0, Rows);
     }
 
@@ -199 +190 @@
     }
     public int GetMissingValues(int variableIndex) {
-      return GetMissingValues(variableIndex, 0, data.Rows);
+      return GetMissingValues(variableIndex, 0, Rows);
     }
 
@@ -214 +205 @@
     public override IDeepCloneable Clone(Cloner cloner) {
       Dataset clone = (Dataset)base.Clone(cloner);
-      clone.data = (DoubleMatrix)data.Clone(cloner);
-      clone.variableNames = (StringArray)variableNames.Clone(cloner);
+      clone.data = (double[,])data.Clone();
+      clone.variableNames = (string[])variableNames.Clone();
       return clone;
     }
@@ -244 +235 @@
     public int Rows {
       get {
-        return data.Rows + 1;
+        return data.GetLength(0);
       }
       set {
         if (value == 0) throw new ArgumentException("Number of rows must be at least one (for variable names)");
-        if (value - 1 != data.Rows) {
-          var newValues = new double[value - 1, data.Columns];
-          for (int row = 0; row < Math.Min(data.Rows, value - 1); row++) {
-            for (int column = 0; column < data.Columns; column++) {
+        if (value != Rows) {
+          var newValues = new double[value, Columns];
+          for (int row = 0; row < Math.Min(Rows, value); row++) {
+            for (int column = 0; column < Columns; column++) {
               newValues[row, column] = data[row, column];
             }
           }
-          Data = new DoubleMatrix(newValues);
+          Data = newValues;
         }
       }
@@ -262 +253 @@
     public int Columns {
       get {
-        return data.Columns;
-      }
-      set {
-        if (value != data.Columns) {
-          var newValues = new double[data.Rows, value];
+        return data.GetLength(1);
+      }
+      set {
+        if (value != Columns) {
+          var newValues = new double[Rows, value];
           var newVariableNames = new string[value];
-          for (int row = 0; row < data.Rows; row++) {
-            for (int column = 0; column < Math.Min(value, data.Columns); column++) {
+          for (int row = 0; row < Rows; row++) {
+            for (int column = 0; column < Math.Min(value, Columns); column++) {
               newValues[row, column] = data[row, column];
             }
@@ -275 +266 @@
           string formatString = new StringBuilder().Append('0', (int)Math.Log10(value) + 1).ToString(); // >= 100 variables => ###
           for (int column = 0; column < value; column++) {
-            if (column < data.Columns)
+            if (column < Columns)
               newVariableNames[column] = variableNames[column];
             else
               newVariableNames[column] = "Var" + column.ToString(formatString);
           }
-          variableNames = new StringArray(newVariableNames);
-          Data = new DoubleMatrix(newValues);
+          variableNames = newVariableNames;
+          Data = newValues;
+        }
+      }
+    }
+
+    IEnumerable<string> IStringConvertibleMatrix.ColumnNames {
+      get { return this.VariableNames; }
+      set {
+        int i = 0;
+        foreach (string variableName in value) {
+          SetVariableName(i, variableName);
+          i++;
         }
       }
@@ -292 +294 @@
 
     public string GetValue(int rowIndex, int columnIndex) {
-      if (rowIndex == 0) {
-        // return variable name
-        return variableNames[columnIndex];
-      } else {
-        return data[rowIndex - 1, columnIndex].ToString();
-      }
+      return data[rowIndex, columnIndex].ToString();
     }
 
     public bool SetValue(string value, int rowIndex, int columnIndex) {
-      if (rowIndex == 0) {
-        // check if the variable name is already used
-        if (variableNames.Contains(value)) {
-          return false;
-        } else {
-          variableNames[columnIndex] = value;
-          return true;
-        }
-      } else {
-        double v;
-        if (double.TryParse(value, out v)) {
-          data[rowIndex - 1, columnIndex] = v;
-          return true;
-        } else return false;
-      }
+      double v;
+      if (double.TryParse(value, out v)) {
+        data[rowIndex, columnIndex] = v;
+        return true;
+      } else return false;
     }
 
     public event EventHandler<EventArgs<int, int>> ItemChanged;
-
     #endregion
   }