X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fmath%2Flinreg%2Flinreg.c;h=ab85e795c93f0c7bb1f9fbc00a11c38c612b9f35;hb=b2859987e3e1c67ffd240945f4590bb23d31bdb8;hp=99d37c13ab211a86b44f1791f5d89df93eea5659;hpb=fcd8d5f89fe81347a0e4ab4e5256fb89d6bb61c1;p=pspp-builds.git

diff --git a/src/math/linreg/linreg.c b/src/math/linreg/linreg.c
index 99d37c13..ab85e795 100644
--- a/src/math/linreg/linreg.c
+++ b/src/math/linreg/linreg.c
@@ -87,6 +87,53 @@ linreg_mean_std (gsl_vector_const_view v, double *mp, double *sp, double *ssp)
 
   return GSL_SUCCESS;
 }
+/*
+  Set V to contain an array of pointers to the variables
+  used in the model. V must be at least C->N_COEFFS in length.
+  The return value is the number of distinct variables found.
+ */
+int
+pspp_linreg_get_vars (const void *c_, struct variable **v)
+{
+  const pspp_linreg_cache *c = c_;
+  struct pspp_linreg_coeff *coef = NULL;
+  const struct variable *tmp;
+  int i;
+  int result = 0;
+
+  /*
+    Make sure the caller doesn't try to sneak a variable
+    into V that is not in the model.
+   */
+  for (i = 0; i < c->n_coeffs; i++)
+    {
+      v[i] = NULL;
+    }
+  /*
+    Start at c->coeff + 1 to avoid the intercept.
+   */
+  v[result] = (struct variable *) pspp_linreg_coeff_get_var (c->coeff + 1, 0);
+  result = (v[result] == NULL) ? 0 : 1;
+
+  for (coef = c->coeff + 2; coef < c->coeff + c->n_coeffs; coef++)
+    {
+      tmp = pspp_linreg_coeff_get_var (coef, 0);
+      assert (tmp != NULL);
+      /* Repeated variables are likely to bunch together, at the end
+	 of the array. */
+      i = result - 1;
+      while (i >= 0 && (v[i]->index != tmp->index))
+	{
+	  i--;
+	}
+      if (i < 0 && result < c->n_coeffs)
+	{
+	  v[result] = (struct variable *) tmp;
+	  result++;
+	}
+    }
+  return result;
+}
 
 /*
   Allocate a pspp_linreg_cache and return a pointer
@@ -99,6 +146,7 @@ pspp_linreg_cache_alloc (size_t n, size_t p)
   pspp_linreg_cache *c;
 
   c = (pspp_linreg_cache *) malloc (sizeof (pspp_linreg_cache));
+  c->depvar = NULL;
   c->indep_means = gsl_vector_alloc (p);
   c->indep_std = gsl_vector_alloc (p);
   c->ssx = gsl_vector_alloc (p);	/* Sums of squares for the
@@ -115,20 +163,28 @@ pspp_linreg_cache_alloc (size_t n, size_t p)
    */
   c->method = PSPP_LINREG_SWEEP;
   c->predict = pspp_linreg_predict;
-  c->residual = pspp_linreg_residual;
+  c->residual = pspp_linreg_residual; /* The procedure to compute my
+					 residuals. */
+  c->get_vars = pspp_linreg_get_vars; /* The procedure that returns
+					 pointers to model
+					 variables. */
+  c->resid = NULL; /* The variable storing my residuals. */
+  c->pred = NULL; /* The variable storing my predicted values. */
 
   return c;
 }
 
-void
-pspp_linreg_cache_free (pspp_linreg_cache * c)
+bool
+pspp_linreg_cache_free (void * m)
 {
+  pspp_linreg_cache *c = m;
   gsl_vector_free (c->indep_means);
   gsl_vector_free (c->indep_std);
   gsl_vector_free (c->ss_indeps);
   gsl_matrix_free (c->cov);
   pspp_linreg_coeff_free (c->coeff);
   free (c);
+  return true;
 }
 
 /*