Changeset 217 for trunk/test/test_regression_linear.cc

Timestamp:

Dec 29, 2004, 10:37:24 AM (18 years ago)

Author:

Peter

Message:

test_regression_local added

File:

• trunk/test/test_regression_linear.cc (modified) (1 diff)

trunk/test/test_regression_linear.cc

@@ -36 +36 @@
   w(3)=0.4;
 
-  double c0, c1, cov00, cov01, cov11, chisq;
-  int n=4;
-  int i=4;
-  gsl_fit_wlinear(x.gsl_vector_pointer()->data, x.gsl_vector_pointer()->stride,
-                  w.gsl_vector_pointer()->data, w.gsl_vector_pointer()->stride,
-                  y.gsl_vector_pointer()->data, y.gsl_vector_pointer()->stride,
-                  x.gsl_vector_pointer()->size,
-                  &c0, &c1,
-                  &cov00, &cov01, &cov11, &chisq);
+  theplu::statistics::RegressionLinear r;
+  r.fit_weighted(x,w,y);
+  printf("# best fit: Y = %g + %g X\n", r.m(), r.k());
 
-  printf("# best fit: Y = %g + %g X\n", c0, c1);
-  printf("# covariance matrix:\n");
-  printf("# [ %g, %g\n#   %g, %g]\n", cov00, cov01, cov01, cov11);
-  printf("# chisq = %g\n", chisq);
-
-  for (i = 0; i < n; i++)
-    printf("data: %g %g %g\n", x[i], y[i], 1/sqrt(w[i]));
-
-  printf("\n");
-
-  for (i = -30 ; i < 130 ; i++)
-    {
-      double xf = x[0] + (i/100.0) * (x[n-1] - x[0]);
-      double yf, yf_err;
-
-      gsl_fit_linear_est (xf, c0, c1, cov00, cov01, cov11, &yf, &yf_err);
-
-      printf("fit: %g %g\n", xf, yf);
-      printf("hi : %g %g\n", xf, yf + yf_err);
-      printf("lo : %g %g\n", xf, yf - yf_err);
-    }
-
+  r.fit(x,y);
+  printf("# best fit: Y = %g + %g X\n", r.m(), r.k());
 
   if (ok)