Fix bug 22419

diff --git a/src/math/linreg/ChangeLog b/src/math/linreg/ChangeLog
index 08ab14401f39406541a4b157d060fbe8a73787b2..1bf0ed985c06e547900957616c4bc95ffa388a90 100644 (file)
--- a/src/math/linreg/ChangeLog
+++ b/src/math/linreg/ChangeLog
@@ -1,4 +1,10 @@
-2007-09-21  Jason Stover  <jhs@wonko.gcsu.edu>
+2008-02-28  Jason Stover  <jhs@math.gcsu.edu>
+
+       * linreg.c (has_coefficient): New function.
+
+       * linreg.c (pspp_linreg_predict): Fix bug 22419.
+
+2007-09-21  Jason Stover  <jhs@math.gcsu.edu>
 
        * linreg.c (pspp_linreg_cache_free): Partial fix of memory leak,
        bug 21056.

diff --git a/src/math/linreg/predict.c b/src/math/linreg/predict.c
index 8e628a4dba27b475bc4c63eee2153e1383d3699b..8eba054a83faee575416447c2feb83a4e087c7f2 100644 (file)
--- a/src/math/linreg/predict.c
+++ b/src/math/linreg/predict.c
@@ -19,6 +19,26 @@
 #include <math/coefficient.h>
 #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
@@ -30,9 +50,9 @@ pspp_linreg_predict (const struct variable **predictors,
                     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 @@ pspp_linreg_predict (const struct variable **predictors,
       /* 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 @@ pspp_linreg_predict (const struct variable **predictors,
   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;
 }