[Pspp-cvs] pspp/src/math/linreg ChangeLog linreg.c coeffic...

[Jason H Stover]

CVSROOT:        /sources/pspp
Module name:    pspp
Branch:         
Changes by:     Jason H Stover <address@hidden> 06/05/11 18:02:11

Modified files:
        src/math/linreg: ChangeLog linreg.c coefficient.c predict.c 

Log message:
        Fixed memory leak. Made coeff a linreg_coeff** for easier use.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/src/math/linreg/ChangeLog.diff?tr1=1.12&tr2=1.13&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/src/math/linreg/linreg.c.diff?tr1=1.12&tr2=1.13&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/src/math/linreg/coefficient.c.diff?tr1=1.13&tr2=1.14&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/src/math/linreg/predict.c.diff?tr1=1.7&tr2=1.8&r1=text&r2=text

Patches:
Index: pspp/src/math/linreg/ChangeLog
diff -u pspp/src/math/linreg/ChangeLog:1.12 pspp/src/math/linreg/ChangeLog:1.13
--- pspp/src/math/linreg/ChangeLog:1.12 Fri Apr 28 13:23:05 2006
+++ pspp/src/math/linreg/ChangeLog      Thu May 11 18:02:11 2006
@@ -1,3 +1,7 @@
+2006-05-11  Jason Stover  <address@hidden>
+
+       * linreg.h: Made linreg_cache's coeff a pspp_linreg_coeff**. 
+
 2006-04-28  Jason Stover  <address@hidden>
 
        * linreg.c (pspp_linreg_get_vars): New function. Fills an array with
Index: pspp/src/math/linreg/coefficient.c
diff -u pspp/src/math/linreg/coefficient.c:1.13 
pspp/src/math/linreg/coefficient.c:1.14
--- pspp/src/math/linreg/coefficient.c:1.13     Fri Apr 28 13:23:05 2006
+++ pspp/src/math/linreg/coefficient.c  Thu May 11 18:02:11 2006
@@ -44,6 +44,7 @@
 void
 pspp_linreg_coeff_free (struct pspp_linreg_coeff *c)
 {
+  free (c->v_info);
   free (c);
 }
 
@@ -60,16 +61,18 @@
   struct pspp_linreg_coeff *coeff;
 
   c->coeff = xnmalloc (X->m->size2 + 1, sizeof (*c->coeff));
-  c->coeff->v_info = NULL; /* Intercept has no associated variable. */
+  c->coeff[0] = xmalloc (sizeof (*c->coeff[0]));
+  c->coeff[0]->v_info = NULL;  /* Intercept has no associated variable. */
   for (i = 0; i < X->m->size2; i++)
     {
       j = i + 1;               /* The first coefficient is the intercept. */
-      coeff = c->coeff + j;
+      c->coeff[j] = xmalloc (sizeof (*c->coeff[j]));
+      coeff = c->coeff[j];
       coeff->n_vars = n_vals;  /* Currently, no procedures allow
                                   interactions.  This line will have to
                                   change when procedures that allow
                                   interaction terms are written. 
-                               */
+                                */
       coeff->v_info = xnmalloc (coeff->n_vars, sizeof (*coeff->v_info));
       assert (coeff->v_info != NULL);
       coeff->v_info->v =
@@ -203,11 +206,11 @@
       return NULL;
     }
 
-  result = c->coeff + i;
+  result = c->coeff[i];
   tmp = pspp_linreg_coeff_get_var (result, 0);
   while (tmp->index != v->index && i < c->n_coeffs)
     {
-      result = c->coeff + i;
+      result = c->coeff[i];
       tmp = pspp_linreg_coeff_get_var (result, 0);
       i++;
     }
@@ -230,7 +233,7 @@
                                val, v->width))
        {                       /* FIX THIS */
          i++;
-         result = c->coeff + i;
+         result = c->coeff[i];
          tmp = pspp_linreg_coeff_get_var (result, 0);
        }
       if (i == c->n_coeffs)
Index: pspp/src/math/linreg/linreg.c
diff -u pspp/src/math/linreg/linreg.c:1.12 pspp/src/math/linreg/linreg.c:1.13
--- pspp/src/math/linreg/linreg.c:1.12  Fri Apr 28 13:23:05 2006
+++ pspp/src/math/linreg/linreg.c       Thu May 11 18:02:11 2006
@@ -87,6 +87,7 @@
 
   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.
@@ -102,25 +103,25 @@
   int result = 0;
 
   /*
-    Make sure the caller doesn't try to sneak a variable
-    into V that is not in the model.
+     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.
+     Start at c->coeff[1] to avoid the intercept.
    */
-  v[result] = (struct variable *) pspp_linreg_coeff_get_var (c->coeff + 1, 0);
+  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++)
+  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. */
+         of the array. */
       i = result - 1;
       while (i >= 0 && (v[i]->index != tmp->index))
        {
@@ -151,10 +152,10 @@
   c->indep_std = gsl_vector_alloc (p);
   c->ssx = gsl_vector_alloc (p);       /* Sums of squares for the
                                           independent variables. 
-                                       */
+                                        */
   c->ss_indeps = gsl_vector_alloc (p); /* Sums of squares for the
                                           model parameters. 
-                                       */
+                                        */
   c->cov = gsl_matrix_alloc (p + 1, p + 1);    /* Covariance matrix. */
   c->n_obs = n;
   c->n_indeps = p;
@@ -163,26 +164,31 @@
    */
   c->method = PSPP_LINREG_SWEEP;
   c->predict = pspp_linreg_predict;
-  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. */
+  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;
 }
 
 bool
-pspp_linreg_cache_free (void * m)
+pspp_linreg_cache_free (void *m)
 {
+  int i;
+
   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);
+  for (i = 0; i < c->n_coeffs; i++)
+    {
+      pspp_linreg_coeff_free (c->coeff[i]);
+    }
   free (c);
   return true;
 }
@@ -240,7 +246,7 @@
   cache->dfe = cache->dft - cache->dfm;
   cache->n_coeffs = X->size2 + 1;      /* Adjust this later to allow for
                                           regression through the origin. 
-                                       */
+                                        */
   if (cache->method == PSPP_LINREG_SWEEP)
     {
       gsl_matrix *sw;
@@ -314,7 +320,7 @@
       for (i = 0; i < cache->n_indeps; i++)
        {
          tmp = gsl_matrix_get (sw, i, cache->n_indeps);
-         cache->coeff[i + 1].estimate = tmp;
+         cache->coeff[i + 1]->estimate = tmp;
          m -= tmp * gsl_vector_get (cache->indep_means, i);
        }
       /*
@@ -350,7 +356,7 @@
            }
          gsl_matrix_set (cache->cov, 0, 0, tmp);
 
-         cache->coeff[0].estimate = m;
+         cache->coeff[0]->estimate = m;
        }
       else
        {
@@ -385,7 +391,7 @@
                                cache->cov, &(cache->sse), wk);
       for (i = 0; i < cache->n_coeffs; i++)
        {
-         cache->coeff[i].estimate = gsl_vector_get (param_estimates, i);
+         cache->coeff[i]->estimate = gsl_vector_get (param_estimates, i);
        }
       if (rc == GSL_SUCCESS)
        {
Index: pspp/src/math/linreg/predict.c
diff -u pspp/src/math/linreg/predict.c:1.7 pspp/src/math/linreg/predict.c:1.8
--- pspp/src/math/linreg/predict.c:1.7  Sat Apr 22 13:50:40 2006
+++ pspp/src/math/linreg/predict.c      Thu May 11 18:02:11 2006
@@ -30,8 +30,7 @@
  */
 double
 pspp_linreg_predict (const struct variable **predictors,
-                    const union value **vals,
-                    const void *c_, int n_vals)
+                    const union value **vals, const void *c_, int n_vals)
 {
   const pspp_linreg_cache *c = c_;
   int i;
@@ -51,13 +50,13 @@
       return c->depvar_mean;
     }
   found = xnmalloc (c->n_coeffs, sizeof (*found));
-  *found = c->coeff;
-  result = c->coeff->estimate; /* Intercept. */
+  *found = c->coeff[0];
+  result = c->coeff[0]->estimate;      /* Intercept. */
 
   /*
-    The loops guard against the possibility that the caller passed us
-    inadequate information, such as too few or too many values, or
-    a redundant list of variable names.
+     The loops guard against the possibility that the caller passed us
+     inadequate information, such as too few or too many values, or
+     a redundant list of variable names.
    */
   for (j = 0; j < n_vals; j++)
     {
@@ -86,8 +85,7 @@
 double
 pspp_linreg_residual (const struct variable **predictors,
                      const union value **vals,
-                     const union value *obs,
-                     const void *c, int n_vals)
+                     const union value *obs, const void *c, int n_vals)
 {
   double pred;
   double result;