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

[Jason H Stover]

CVSROOT:        /sources/pspp
Module name:    pspp
Changes by:     Jason H Stover <jstover>        08/02/29 02:22:48

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

Log message:
        Fix bug 22419

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/pspp/src/math/linreg/predict.c?cvsroot=pspp&r1=1.15&r2=1.16
http://cvs.savannah.gnu.org/viewcvs/pspp/src/math/linreg/ChangeLog?cvsroot=pspp&r1=1.18&r2=1.19

Patches:
Index: predict.c
===================================================================
RCS file: /sources/pspp/pspp/src/math/linreg/predict.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- predict.c   4 Dec 2007 04:22:25 -0000       1.15
+++ predict.c   29 Feb 2008 02:22:48 -0000      1.16
@@ -20,6 +20,26 @@
 #include <gl/xalloc.h>
 
 /*
+  Is the coefficient COEF contained in the list of coefficients
+  COEF_LIST?
+ */
+static int
+has_coefficient (const struct pspp_coeff **coef_list, const struct pspp_coeff 
*coef,
+                size_t n)
+{
+  size_t i = 0;
+
+  while (i < n)
+    {
+      if (coef_list[i] == coef)
+       {
+         return 1;
+       }
+      i++;
+    }
+  return 0;
+}
+/*
   Predict the value of the dependent variable with the
   new set of predictors. PREDICTORS must point to a list
   of variables, each of whose values are stored in VALS,
@@ -30,9 +50,9 @@
                     const union value **vals, const void *c_, int n_vals)
 {
   const pspp_linreg_cache *c = c_;
-  int i;
   int j;
-  const struct pspp_coeff **found;
+  size_t next_coef = 1;
+  const struct pspp_coeff **coef_list;
   const struct pspp_coeff *coe;
   double result;
   double tmp;
@@ -46,8 +66,8 @@
       /* The stupid model: just guess the mean. */
       return c->depvar_mean;
     }
-  found = xnmalloc (c->n_coeffs, sizeof (*found));
-  *found = c->coeff[0];
+  coef_list = xnmalloc (c->n_coeffs, sizeof (*coef_list));
+  *coef_list = c->coeff[0];
   result = c->coeff[0]->estimate;      /* Intercept. */
 
   /*
@@ -58,23 +78,18 @@
   for (j = 0; j < n_vals; j++)
     {
       coe = pspp_linreg_get_coeff (c, predictors[j], vals[j]);
-      i = 1;
-      while (found[i] == coe && i < c->n_coeffs)
-       {
-         i++;
-       }
-      if (i < c->n_coeffs)
+      if (!has_coefficient (coef_list, coe, next_coef))
        {
-         found[i] = coe;
          tmp = pspp_coeff_get_est (coe);
          if (var_is_numeric (predictors[j]))
            {
              tmp *= vals[j]->f;
            }
          result += tmp;
+         coef_list[next_coef++] = coe;
        }
     }
-  free (found);
+  free (coef_list);
 
   return result;
 }

Index: ChangeLog
===================================================================
RCS file: /sources/pspp/pspp/src/math/linreg/ChangeLog,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -b -r1.18 -r1.19
--- ChangeLog   21 Sep 2007 20:48:14 -0000      1.18
+++ ChangeLog   29 Feb 2008 02:22:48 -0000      1.19
@@ -1,4 +1,10 @@
-2007-09-21  Jason Stover  <address@hidden>
+2008-02-28  Jason Stover  <address@hidden>
+
+       * linreg.c (has_coefficient): New function.
+
+       * linreg.c (pspp_linreg_predict): Fix bug 22419.
+
+2007-09-21  Jason Stover  <address@hidden>
 
        * linreg.c (pspp_linreg_cache_free): Partial fix of memory leak,
        bug 21056.