X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fmath%2Flinreg.c;h=d1e0dae980e1e12c03e312b0fcbf7fd6139b6fb7;hb=9a68ff613733d0a5447cfd81db99f6ea19c2cba2;hp=63d1a0f976ee420ca52b476e67aa85cd94ff4a5e;hpb=a258e53c63a08b0ec48aea8f03808eb651729424;p=pspp

diff --git a/src/math/linreg.c b/src/math/linreg.c
index 63d1a0f976..d1e0dae980 100644
--- a/src/math/linreg.c
+++ b/src/math/linreg.c
@@ -1,5 +1,5 @@
 /* PSPP - a program for statistical analysis.
-   Copyright (C) 2005, 2010 Free Software Foundation, Inc. 
+   Copyright (C) 2005, 2010, 2011, 2017 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -15,17 +15,21 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
 
 #include <config.h>
+
+#include "math/linreg.h"
+
 #include <gsl/gsl_blas.h>
 #include <gsl/gsl_cblas.h>
 #include <gsl/gsl_errno.h>
 #include <gsl/gsl_fit.h>
 #include <gsl/gsl_linalg.h>
 #include <gsl/gsl_multifit.h>
-#include <linreg/sweep.h>
-#include <math/linreg.h>
-#include <src/data/variable.h>
-#include <src/data/value.h>
-#include <gl/xalloc.h>
+
+#include "data/value.h"
+#include "data/variable.h"
+#include "linreg/sweep.h"
+
+#include "gl/xalloc.h"
 
 /*
   Find the least-squares estimate of b for the linear model:
@@ -53,9 +57,63 @@
   Springer. 1998. ISBN 0-387-98542-5.
 */
 
+struct linreg
+{
+  double n_obs;			/* Number of observations. */
+  int n_indeps;			/* Number of independent variables. */
+  int n_coeffs;                 /* The intercept is not considered a
+				   coefficient here. */
+
+  /*
+    Pointers to the variables.
+   */
+  const struct variable *depvar;
+  const struct variable **indep_vars;
+
+  double *coeff;
+  double intercept;
+  /*
+     Means and standard deviations of the variables.
+     If these pointers are null when pspp_linreg() is
+     called, pspp_linreg() will compute their values.
+
+     Entry i of indep_means is the mean of independent
+     variable i, whose observations are stored in the ith
+     column of the design matrix.
+   */
+  double depvar_mean;
+  gsl_vector *indep_means;
+  gsl_vector *indep_std;
+
+  /*
+     Sums of squares.
+   */
+  double ssm;			/* Sums of squares for the overall model. */
+  double sst;			/* Sum of squares total. */
+  double sse;			/* Sum of squares error. */
+  double mse;			/* Mean squared error. This is just sse /
+				   dfe, but since it is the best unbiased
+				   estimate of the population variance, it
+				   has its own entry here. */
+  /*
+     Covariance matrix of the parameter estimates.
+   */
+  gsl_matrix *cov;
+  /*
+     Degrees of freedom.
+   */
+  double dft;
+  double dfe;
+  double dfm;
+
+  int dependent_column; /* Column containing the dependent variable. Defaults to last column. */
+  int refcnt;
+
+  bool origin;
+};
 
 const struct variable **
-linreg_get_vars (const linreg *c)
+linreg_get_vars (const struct linreg *c)
 {
   return c->indep_vars;
 }
@@ -64,11 +122,11 @@ linreg_get_vars (const linreg *c)
   Allocate a linreg and return a pointer to it. n is the number of
   cases, p is the number of independent variables.
  */
-linreg *
+struct linreg *
 linreg_alloc (const struct variable *depvar, const struct variable **indep_vars,
-	      double n, size_t p)
+	      double n, size_t p, bool origin)
 {
-  linreg *c;
+  struct linreg *c;
   size_t i;
 
   c = xmalloc (sizeof (*c));
@@ -82,35 +140,41 @@ linreg_alloc (const struct variable *depvar, const struct variable **indep_vars,
   c->indep_means = gsl_vector_alloc (p);
   c->indep_std = gsl_vector_alloc (p);
 
-  c->ss_indeps = gsl_vector_alloc (p);	/* Sums of squares for the
-					   model parameters.
-					 */
   c->n_obs = n;
   c->n_indeps = p;
   c->n_coeffs = p;
   c->coeff = xnmalloc (p, sizeof (*c->coeff));
   c->cov = gsl_matrix_calloc (c->n_coeffs + 1, c->n_coeffs + 1);
-  c->dft = n - 1;
+  c->dft = n;
+  if (!origin)
+    c->dft--;
+
   c->dfm = p;
   c->dfe = c->dft - c->dfm;
   c->intercept = 0.0;
   c->depvar_mean = 0.0;
-  c->depvar_std = 0.0;
   /*
      Default settings.
    */
-  c->method = LINREG_SWEEP;
-  c->pred = NULL;
-  c->resid = NULL;
+
+  c->refcnt = 1;
+
+  c->origin = origin;
 
   return c;
 }
 
-bool
-linreg_free (void *m)
+
+void
+linreg_ref (struct linreg *c)
+{
+  c->refcnt++;
+}
+
+void
+linreg_unref (struct linreg *c)
 {
-  linreg *c = m;
-  if (c != NULL)
+  if (--c->refcnt == 0)
     {
       gsl_vector_free (c->indep_means);
       gsl_vector_free (c->indep_std);
@@ -119,21 +183,16 @@ linreg_free (void *m)
       free (c->coeff);
       free (c);
     }
-  return true;
 }
 
 static void
-post_sweep_computations (linreg *l, gsl_matrix *sw)
+post_sweep_computations (struct linreg *l, gsl_matrix *sw)
 {
-  gsl_matrix *xm;
-  gsl_matrix_view xtx;
-  gsl_matrix_view xmxtx;
   double m;
-  double tmp;
   size_t i;
   size_t j;
   int rc;
-  
+
   assert (sw != NULL);
   assert (l != NULL);
 
@@ -145,7 +204,7 @@ post_sweep_computations (linreg *l, gsl_matrix *sw)
   m = l->depvar_mean;
   for (i = 0; i < l->n_indeps; i++)
     {
-      tmp = gsl_matrix_get (sw, i, l->n_indeps);
+      double tmp = gsl_matrix_get (sw, i, l->n_indeps);
       l->coeff[i] = tmp;
       m -= tmp * linreg_get_indep_variable_mean (l, i);
     }
@@ -153,7 +212,7 @@ post_sweep_computations (linreg *l, gsl_matrix *sw)
     Get the covariance matrix of the parameter estimates.
     Only the upper triangle is necessary.
   */
-  
+
   /*
     The loops below do not compute the entries related
     to the estimated intercept.
@@ -161,42 +220,49 @@ post_sweep_computations (linreg *l, gsl_matrix *sw)
   for (i = 0; i < l->n_indeps; i++)
     for (j = i; j < l->n_indeps; j++)
       {
-	tmp = -1.0 * l->mse * gsl_matrix_get (sw, i, j);
+	double tmp = -1.0 * l->mse * gsl_matrix_get (sw, i, j);
 	gsl_matrix_set (l->cov, i + 1, j + 1, tmp);
       }
-  /*
-    Get the covariances related to the intercept.
-  */
-  xtx = gsl_matrix_submatrix (sw, 0, 0, l->n_indeps, l->n_indeps);
-  xmxtx = gsl_matrix_submatrix (l->cov, 0, 1, 1, l->n_indeps);
-  xm = gsl_matrix_calloc (1, l->n_indeps);
-  for (i = 0; i < xm->size2; i++)
-    {
-      gsl_matrix_set (xm, 0, i, 
-		      linreg_get_indep_variable_mean (l, i));
-    }
-  rc = gsl_blas_dsymm (CblasRight, CblasUpper, l->mse,
-		       &xtx.matrix, xm, 0.0, &xmxtx.matrix);
-  gsl_matrix_free (xm);
-  if (rc == GSL_SUCCESS)
+
+  if (! l->origin)
     {
-      tmp = l->mse / l->n_obs;
-      for (i = 1; i < 1 + l->n_indeps; i++)
+      gsl_matrix *xm;
+      gsl_matrix_view xtx;
+      gsl_matrix_view xmxtx;
+      /*
+	Get the covariances related to the intercept.
+      */
+      xtx = gsl_matrix_submatrix (sw, 0, 0, l->n_indeps, l->n_indeps);
+      xmxtx = gsl_matrix_submatrix (l->cov, 0, 1, 1, l->n_indeps);
+      xm = gsl_matrix_calloc (1, l->n_indeps);
+      for (i = 0; i < xm->size2; i++)
 	{
-	  tmp -= gsl_matrix_get (l->cov, 0, i)
-	    * linreg_get_indep_variable_mean (l, i - 1);
+	  gsl_matrix_set (xm, 0, i,
+			  linreg_get_indep_variable_mean (l, i));
+	}
+      rc = gsl_blas_dsymm (CblasRight, CblasUpper, l->mse,
+			   &xtx.matrix, xm, 0.0, &xmxtx.matrix);
+      gsl_matrix_free (xm);
+      if (rc == GSL_SUCCESS)
+	{
+	  double tmp = l->mse / l->n_obs;
+	  for (i = 1; i < 1 + l->n_indeps; i++)
+	    {
+	      tmp -= gsl_matrix_get (l->cov, 0, i)
+		* linreg_get_indep_variable_mean (l, i - 1);
+	    }
+	  gsl_matrix_set (l->cov, 0, 0, tmp);
+
+	  l->intercept = m;
+	}
+      else
+	{
+	  fprintf (stderr, "%s:%d:gsl_blas_dsymm: %s\n",
+		   __FILE__, __LINE__, gsl_strerror (rc));
+	  exit (rc);
 	}
-      gsl_matrix_set (l->cov, 0, 0, tmp);
-      
-      l->intercept = m;
-    }
-  else
-    {
-      fprintf (stderr, "%s:%d:gsl_blas_dsymm: %s\n",
-	       __FILE__, __LINE__, gsl_strerror (rc));
-      exit (rc);
     }
-}  
+}
 
 /*
   Predict the value of the dependent variable with the new set of
@@ -204,12 +270,12 @@ post_sweep_computations (linreg *l, gsl_matrix *sw)
   order of the coefficients in the linreg struct.
  */
 double
-linreg_predict (const linreg *c, const double *vals, size_t n_vals)
+linreg_predict (const struct linreg *c, const double *vals, size_t n_vals)
 {
   size_t j;
   double result;
 
-  assert (n_vals = c->n_coeffs);
+  assert (n_vals == c->n_coeffs);
   if (vals == NULL || c == NULL)
     {
       return GSL_NAN;
@@ -230,7 +296,7 @@ linreg_predict (const linreg *c, const double *vals, size_t n_vals)
 }
 
 double
-linreg_residual (const linreg *c, double obs, const double *vals, size_t n_vals)
+linreg_residual (const struct linreg *c, double obs, const double *vals, size_t n_vals)
 {
   if (vals == NULL || c == NULL)
     {
@@ -239,35 +305,26 @@ linreg_residual (const linreg *c, double obs, const double *vals, size_t n_vals)
   return (obs - linreg_predict (c, vals, n_vals));
 }
 
-double linreg_get_indep_variable_sd (linreg *c, size_t j)
-{
-  assert (c != NULL);
-  return gsl_vector_get (c->indep_std, j);
-}
-
-void linreg_set_indep_variable_sd (linreg *c, size_t j, double s)
-{
-  assert (c != NULL);
-  gsl_vector_set (c->indep_std, j, s);
-}
-
 /*
   Mean of the independent variable.
  */
-double linreg_get_indep_variable_mean (linreg *c, size_t j)
+double
+linreg_get_indep_variable_mean (const struct linreg *c, size_t j)
 {
   assert (c != NULL);
   return gsl_vector_get (c->indep_means, j);
 }
 
-void linreg_set_indep_variable_mean (linreg *c, size_t j, double m)
+void
+linreg_set_indep_variable_mean (struct linreg *c, size_t j, double m)
 {
   assert (c != NULL);
   gsl_vector_set (c->indep_means, j, m);
 }
 
+#if 0
 static void
-linreg_fit_qr (const gsl_matrix *cov, linreg *l)
+linreg_fit_qr (const gsl_matrix *cov, struct linreg *l)
 {
   double intcpt_coef = 0.0;
   double intercept_variance = 0.0;
@@ -277,7 +334,6 @@ linreg_fit_qr (const gsl_matrix *cov, linreg *l)
   gsl_vector *xty;
   gsl_vector *tau;
   gsl_vector *params;
-  double tmp = 0.0;
   size_t i;
   size_t j;
 
@@ -326,30 +382,33 @@ linreg_fit_qr (const gsl_matrix *cov, linreg *l)
 	  gsl_matrix_set (q, i, j, gsl_matrix_get (q, j, i));
 	}
     }
-  l->intercept = linreg_get_depvar_mean (l);
-  tmp = 0.0;
-  for (i = 0; i < l->n_indeps; i++)
-    {
-      tmp = linreg_get_indep_variable_mean (l, i);
-      l->intercept -= l->coeff[i] * tmp;
-      intercept_variance += tmp * tmp * gsl_matrix_get (q, i, i);
-    }
 
-  /* Covariances related to the intercept. */
-  intercept_variance += linreg_mse (l) / linreg_n_obs (l);
-  gsl_matrix_set (l->cov, 0, 0, intercept_variance);  
-  for (i = 0; i < q->size1; i++)
+  if (!l->origin)
     {
-      for (j = 0; j < q->size2; j++)
+      l->intercept = linreg_get_depvar_mean (l);
+      for (i = 0; i < l->n_indeps; i++)
 	{
-	  intcpt_coef -= gsl_matrix_get (q, i, j) 
-	    * linreg_get_indep_variable_mean (l, j);
+	  double tmp = linreg_get_indep_variable_mean (l, i);
+	  l->intercept -= l->coeff[i] * tmp;
+	  intercept_variance += tmp * tmp * gsl_matrix_get (q, i, i);
+	}
+
+      /* Covariances related to the intercept. */
+      intercept_variance += linreg_mse (l) / linreg_n_obs (l);
+      gsl_matrix_set (l->cov, 0, 0, intercept_variance);
+      for (i = 0; i < q->size1; i++)
+	{
+	  for (j = 0; j < q->size2; j++)
+	    {
+	      intcpt_coef -= gsl_matrix_get (q, i, j)
+		* linreg_get_indep_variable_mean (l, j);
+	    }
+	  gsl_matrix_set (l->cov, 0, i + 1, intcpt_coef);
+	  gsl_matrix_set (l->cov, i + 1, 0, intcpt_coef);
+	  intcpt_coef = 0.0;
 	}
-      gsl_matrix_set (l->cov, 0, i + 1, intcpt_coef);
-      gsl_matrix_set (l->cov, i + 1, 0, intcpt_coef);
-      intcpt_coef = 0.0;
     }
-      
+
   gsl_matrix_free (q);
   gsl_matrix_free (r);
   gsl_vector_free (xty);
@@ -357,6 +416,9 @@ linreg_fit_qr (const gsl_matrix *cov, linreg *l)
   gsl_matrix_free (xtx);
   gsl_vector_free (params);
 }
+#endif
+
+#define REG_LARGE_DATA 1000
 
 /*
   Estimate the model parameters from the covariance matrix. This
@@ -365,99 +427,134 @@ linreg_fit_qr (const gsl_matrix *cov, linreg *l)
   matrix.
 */
 void
-linreg_fit (const gsl_matrix *cov, linreg *l)
+linreg_fit (const gsl_matrix *cov, struct linreg *l)
 {
   assert (l != NULL);
   assert (cov != NULL);
 
   l->sst = gsl_matrix_get (cov, cov->size1 - 1, cov->size2 - 1);
-  if (l->method == LINREG_SWEEP)
+
+#if 0
+  /*  This QR decomposition path seems to produce the incorrect
+      values.  See https://savannah.gnu.org/bugs/?51373  */
+  if ((l->n_obs * l->n_obs > l->n_indeps) && (l->n_obs > REG_LARGE_DATA))
     {
-      gsl_matrix *params;
-      params = gsl_matrix_calloc (cov->size1, cov->size2);
+      /*
+	For large data sets, use QR decomposition.
+      */
+      linreg_fit_qr (cov, l);
+    }
+  else
+#endif    
+    {
+      gsl_matrix *params = gsl_matrix_calloc (cov->size1, cov->size2);
       gsl_matrix_memcpy (params, cov);
       reg_sweep (params, l->dependent_column);
-      post_sweep_computations (l, params);  
+      post_sweep_computations (l, params);
       gsl_matrix_free (params);
     }
-  else if (l->method == LINREG_QR)
-    {
-      linreg_fit_qr (cov, l);
-    }
 }
 
-double linreg_mse (const linreg *c)
+double
+linreg_mse (const struct linreg *c)
 {
   assert (c != NULL);
   return (c->sse / c->dfe);
 }
 
-double linreg_intercept (const linreg *c)
+double
+linreg_intercept (const struct linreg *c)
 {
   return c->intercept;
 }
 
-gsl_matrix *
-linreg_cov (const linreg *c)
+const gsl_matrix *
+linreg_cov (const struct linreg *c)
 {
   return c->cov;
 }
 
-double 
-linreg_coeff (const linreg *c, size_t i)
+double
+linreg_coeff (const struct linreg *c, size_t i)
 {
   return (c->coeff[i]);
 }
 
 const struct variable *
-linreg_indep_var (const linreg *c, size_t i)
+linreg_indep_var (const struct linreg *c, size_t i)
 {
   return (c->indep_vars[i]);
 }
 
-size_t 
-linreg_n_coeffs (const linreg *c)
+int
+linreg_n_indeps (const struct linreg *c)
+{
+  return c->n_indeps;
+}
+
+
+const struct variable *
+linreg_dep_var (const struct linreg *c)
+{
+  return c->depvar;
+}
+
+
+size_t
+linreg_n_coeffs (const struct linreg *c)
 {
   return c->n_coeffs;
 }
 
 double
-linreg_n_obs (const linreg *c)
+linreg_n_obs (const struct linreg *c)
 {
   return c->n_obs;
 }
 
 double
-linreg_sse (const linreg *c)
+linreg_sse (const struct linreg *c)
 {
   return c->sse;
 }
 
 double
-linreg_ssreg (const linreg *c)
+linreg_ssreg (const struct linreg *c)
 {
   return (c->sst - c->sse);
 }
 
-double linreg_sst (const linreg *c)
+double linreg_sst (const struct linreg *c)
 {
   return c->sst;
 }
 
-double 
-linreg_dfmodel ( const linreg *c)
+double
+linreg_dfmodel ( const struct linreg *c)
 {
   return c->dfm;
 }
 
+double
+linreg_dferror ( const struct linreg *c)
+{
+  return c->dfe;
+}
+
+double
+linreg_dftotal ( const struct linreg *c)
+{
+  return c->dft;
+}
+
 void
-linreg_set_depvar_mean (linreg *c, double x)
+linreg_set_depvar_mean (struct linreg *c, double x)
 {
   c->depvar_mean = x;
 }
 
-double 
-linreg_get_depvar_mean (linreg *c)
+double
+linreg_get_depvar_mean (const struct linreg *c)
 {
   return c->depvar_mean;
 }