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

Timestamp:

04/04/10 18:53:55 (14 years ago)

Author:

gkronber

Message:

Implemented import of CSV files for regression problems. #938 (Data types and operators for regression problems)

File:

• trunk/sources/HeuristicLab.Problems.DataAnalysis/3.3/Dataset.cs (modified) (1 diff)

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

@@ -40 +40 @@
 
     public Dataset()
-      : this(new double[,] { { 0.0 } }) {
-    }
-
-    public Dataset(double[,] data)
+      : this(new string[] { "x" }, new double[,] { { 0.0 } }) {
+    }
+
+    public Dataset(IEnumerable<string> variableNames, double[,] data)
       : base() {
       Name = "-";
+      if (variableNames.Count() != data.GetLength(1)) {
+        throw new ArgumentException("Number of variable names doesn't match the number of columns of data");
+      }
       Data = new DoubleMatrix(data);
-      string formatString = new StringBuilder().Append('#', (int)Math.Log10(this.data.Columns) + 1).ToString(); // >= 100 variables => ###
-      this.variableNames = new StringArray((from col in Enumerable.Range(1, this.data.Columns)
-                                            select "Var" + col.ToString(formatString)).ToArray());
+      this.variableNames = new StringArray(variableNames.ToArray());
     }