Changeset 15459 for branches/MathNetNumerics-Exploration-2789/HeuristicLab.Algorithms.DataAnalysis.Experimental/SBART.cs

Timestamp:

11/07/17 19:49:23 (6 years ago)

Author:

gkronber

Message:

experimentation

File:

• branches/MathNetNumerics-Exploration-2789/HeuristicLab.Algorithms.DataAnalysis.Experimental/SBART.cs (modified) (5 diffs)

branches/MathNetNumerics-Exploration-2789/HeuristicLab.Algorithms.DataAnalysis.Experimental/SBART.cs

@@ -125 +125 @@
 
       int n = x.Length;
-      float[] leverage = new float[n];
-      float[] y_smoothed = new float[n];
       int ic = n - 1;
       int ier = -99;
@@ -133 +131 @@
 
       float crit = -99.0f;
-      int icrit = 0; // 0..don't calc CV,  1 .. GCV, 2 CV
+      int icrit = 1; // 0..don't calc CV,  1 .. GCV, 2 CV
 
       // float smoothingParameter = -99.0f;
-      int smoothingParameterIndicator = 1; 
+      int smoothingParameterIndicator = 0; 
       float lowerSmoothingParameter = 0f;
       float upperSmoothingParameter = 1.0f;
@@ -153 +151 @@
         SBART.setreg_x64(xs, ys, ws,
           ref n, xw, ref nx, ref min, ref range, knots, ref nk);
-        if(nx < 4) {
+
+        /* use all points as knot points 
+        nk = nx + 2;
+        knots[0] = xs[0];
+        knots[1] = xs[0];
+        knots[2] = xs[0];
+        Array.Copy(xs, 0, knots, 3, nx);
+        knots[nx + 3] = xs[nx - 1];
+        knots[nx + 4] = xs[nx - 1];
+        knots[nx + 5] = xs[nx - 1];
+        */
+
+        // use uniform grid of knots
+        nk = 20;
+        knots = new float[nk + 4];
+        knots[0] = xs[0];
+        knots[1] = xs[0];
+        knots[2] = xs[0];
+        for(int i = 3; i<nk+1;i++) {
+          knots[i] = (i-3f) / (nk-1);
+        }
+        knots[nk] = xs[nx - 1];
+        knots[nk + 1] = xs[nx - 1];
+        knots[nk + 2] = xs[nx - 1];
+        knots[nk + 3] = xs[nx - 1];
+
+        if (nx < 4) {
           report = new SBART_Report();
           report.leverage = new double[0];
@@ -160 +184 @@
 
         float[] coeff = new float[nk];
+        float[] leverage = new float[nx];
+        float[] y_smoothed = new float[nx];
+
 
         // working arrays for sbart
@@ -172 +199 @@
         float[] sg3 = new float[nk];
         int ld4 = 4;
-        float[,] adb = new float[nk, ld4];
+        float[,] adb = new float[ld4, nk];
 
         float[,] p1ip = new float[nk, ld4];
         int ldnk = nk + 4;
-        float[,] p2ip = new float[nk, ldnk];
-
-        SBART.sbart_x64(xs, ys, ws, ref nx, knots, ref nk, coeff, y_smoothed, leverage, ref crit, ref icrit, 
+        float[,] p2ip = new float[nk, nx];
+
+        SBART.sbart_x64(xs.Take(nx).ToArray(), ys.Take(nx).ToArray(), ws.Take(nx).ToArray(), ref nx, 
+          knots, ref nk, 
+          coeff, y_smoothed, leverage, 
+          ref crit, ref icrit, 
           ref smoothingParameter, ref smoothingParameterIndicator, ref lowerSmoothingParameter, ref upperSmoothingParameter,
           ref tol, ref isetup,