From 436b01ace5b84c27963f6130dca0e69fe15f9a17 Mon Sep 17 00:00:00 2001 From: Jason Stover Date: Fri, 29 Feb 2008 02:22:48 +0000 Subject: [PATCH] Fix bug 22419 --- src/math/linreg/ChangeLog | 8 +++++++- src/math/linreg/predict.c | 39 +++++++++++++++++++++++++++------------ 2 files changed, 34 insertions(+), 13 deletions(-) diff --git a/src/math/linreg/ChangeLog b/src/math/linreg/ChangeLog index 08ab1440..1bf0ed98 100644 --- a/src/math/linreg/ChangeLog +++ b/src/math/linreg/ChangeLog @@ -1,4 +1,10 @@ -2007-09-21 Jason Stover +2008-02-28 Jason Stover + + * linreg.c (has_coefficient): New function. + + * linreg.c (pspp_linreg_predict): Fix bug 22419. + +2007-09-21 Jason Stover * 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 8e628a4d..8eba054a 100644 --- a/src/math/linreg/predict.c +++ b/src/math/linreg/predict.c @@ -19,6 +19,26 @@ #include #include +/* + 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; } -- 2.30.2