Changeset 2285 for trunk/sources/HeuristicLab.DataAnalysis/3.2

Timestamp:

08/13/09 17:28:07 (15 years ago)

Author:

gkronber

Message:

Worked on #722 (IModel should provide a Predict() method to get predicted values for an input vector).
At the same time removed parameter PunishmentFactor from GP algorithms (this parameter is internal to TreeEvaluators now).

File:

• trunk/sources/HeuristicLab.DataAnalysis/3.2/Dataset.cs (modified) (4 diffs)

trunk/sources/HeuristicLab.DataAnalysis/3.2/Dataset.cs

@@ -27 +27 @@
 using System.Globalization;
 using System.Text;
+using System.Linq;
 
 namespace HeuristicLab.DataAnalysis {
@@ -78 +79 @@
       get { return scalingOffset; }
       set {
-        if (value.Length != scalingOffset.Length) 
+        if (value.Length != scalingOffset.Length)
           throw new ArgumentException("Length of scaling offset array doesn't match number of variables");
-        scalingOffset = value; }
+        scalingOffset = value;
+      }
     }
 
@@ -98 +100 @@
       get { return samples; }
       set {
+        variableNames = Enumerable.Range(1, columns).Select(x => "Var" + x.ToString("###")).ToArray();
         scalingFactor = new double[columns];
         scalingOffset = new double[columns];
@@ -115 +118 @@
     }
 
-    public Dataset() {
+    public Dataset()
+      : this(new double[,] { { 0.0 } }) {
+    }
+
+    public Dataset(double[,] samples) {
       Name = "-";
-      variableNames = new string[] { "Var0" };
-      Columns = 1;
-      Rows = 1;
-      Samples = new double[1];
-      scalingOffset = new double[] { 0.0 };
-      scalingFactor = new double[] { 1.0 };
-      cachedValuesInvalidated = true;
+      Rows = samples.GetLength(0);
+      Columns = samples.GetLength(1);
+      double[] values = new double[Rows * Columns];
+      int i = 0;
+      for (int row = 0; row < Rows; row++) {
+        for (int column = 0; column < columns; column++) {
+          values[i++] = samples[row, column];
+        }
+      }
+      Samples = values;
       fireChangeEvents = true;
     }
 
-    
 
     public string GetVariableName(int variableIndex) {