X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fmath%2Flinreg.c;h=147ff272cd54a4fee2e8bcb7aa83da3bea2baf05;hb=14f4522a17db23e67a6fa17876633cc6260cb42b;hp=7c85634a50fd28e558cdb8cfef0d38d30da79838;hpb=f481fd69631024bcdc7dc2369bbc1592d7a43ac7;p=pspp

diff --git a/src/math/linreg.c b/src/math/linreg.c
index 7c85634a50..147ff272cd 100644
--- 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
@@ -244,22 +244,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);
@@ -402,7 +390,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 +450,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;
 }