Chi Square Dialog: Cosmetic improvements

[pspp] / src / math / linreg.c

diff --git a/src/math/linreg.c b/src/math/linreg.c
index 7c85634a50fd28e558cdb8cfef0d38d30da79838..43f4033510515320d2e0dec430806fc16f31aa25 100644 (file)
--- a/src/math/linreg.c
+++ b/src/math/linreg.c
@@ -86,9 +86,6 @@ 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;
@@ -99,32 +96,35 @@ linreg_alloc (const struct variable *depvar, const struct variable **indep_vars,
   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;
 
   return c;
 }
 
-bool
-linreg_free (void *m)
+
+void
+linreg_ref (linreg *c)
+{
+  c->refcnt++;
+}
+
+void
+linreg_unref (linreg *c)
 {
-  linreg *c = m;
-  if (c != NULL)
+  if (--c->refcnt == 0)
     {
       gsl_vector_free (c->indep_means);
       gsl_vector_free (c->indep_std);
-      gsl_vector_free (c->ss_indeps);
       gsl_matrix_free (c->cov);
       free (c->indep_vars);
       free (c->coeff);
       free (c);
     }
-  return true;
 }
 
 static void
@@ -134,7 +134,6 @@ post_sweep_computations (linreg *l, gsl_matrix *sw)
   gsl_matrix_view xtx;
   gsl_matrix_view xmxtx;
   double m;
-  double tmp;
   size_t i;
   size_t j;
   int rc;
@@ -150,7 +149,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);
     }
@@ -166,7 +165,7 @@ 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);
       }
   /*
@@ -185,7 +184,7 @@ post_sweep_computations (linreg *l, gsl_matrix *sw)
   gsl_matrix_free (xm);
   if (rc == GSL_SUCCESS)
     {
-      tmp = l->mse / l->n_obs;
+      double tmp = l->mse / l->n_obs;
       for (i = 1; i < 1 + l->n_indeps; i++)
        {
          tmp -= gsl_matrix_get (l->cov, 0, i)
@@ -244,22 +243,10 @@ 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 linreg *c, size_t j)
 {
   assert (c != NULL);
   return gsl_vector_get (c->indep_means, j);
@@ -282,7 +269,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;
 
@@ -332,10 +318,9 @@ linreg_fit_qr (const gsl_matrix *cov, linreg *l)
        }
     }
   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);
+      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);
     }
@@ -402,7 +387,7 @@ double linreg_intercept (const linreg *c)
   return c->intercept;
 }
 
-gsl_matrix *
+const gsl_matrix *
 linreg_cov (const linreg *c)
 {
   return c->cov;
@@ -462,7 +447,7 @@ linreg_set_depvar_mean (linreg *c, double x)
 }
 
 double 
-linreg_get_depvar_mean (linreg *c)
+linreg_get_depvar_mean (const linreg *c)
 {
   return c->depvar_mean;
 }