Fix bug 22419

[pspp-builds.git] / src / math / linreg / predict.c

diff --git a/src/math/linreg/predict.c b/src/math/linreg/predict.c
index 49e24434b5ff5cca2ae5ae1d95ecffc335b06040..8eba054a83faee575416447c2feb83a4e087c7f2 100644 (file)
--- a/src/math/linreg/predict.c
+++ b/src/math/linreg/predict.c
@@ -1,27 +1,44 @@
-/*
-   lib/linreg/predict.c
-  
-   Copyright (C) 2005 Free Software Foundation, Inc. Written by Jason H. Stover.
+/* PSPP - a program for statistical analysis.
+   Copyright (C) 2005 Free Software Foundation, Inc. 
 
-   This program is free software; you can redistribute it and/or modify it under
-   the terms of the GNU General Public License as published by the Free
-   Software Foundation; either version 2 of the License, or (at your option)
-   any later version.
-   
-   This program is distributed in the hope that it will be useful, but WITHOUT
-   ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-   FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
-   more details.
-   
-   You should have received a copy of the GNU General Public License along with
-   this program; if not, write to the Free Software Foundation, Inc., 51
-   Franklin Street, Fifth Floor, Boston, MA 02111-1307, USA.
- */
+   This program is free software: you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation, either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>. */
 
+#include <config.h>
 #include <math/linreg/linreg.h>
-#include <math/linreg/coefficient.h>
+#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,13 +47,13 @@
  */
 double
 pspp_linreg_predict (const struct variable **predictors,
-                    const union value **vals,
-                    const pspp_linreg_cache * c, int n_vals)
+                    const union value **vals, const void *c_, int n_vals)
 {
-  int i;
+  const pspp_linreg_cache *c = c_;
   int j;
-  const struct pspp_linreg_coeff **found;
-  const struct pspp_linreg_coeff *coe;
+  size_t next_coef = 1;
+  const struct pspp_coeff **coef_list;
+  const struct pspp_coeff *coe;
   double result;
   double tmp;
 
@@ -49,35 +66,30 @@ 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;
-  result = c->coeff->estimate; /* Intercept. */
+  coef_list = xnmalloc (c->n_coeffs, sizeof (*coef_list));
+  *coef_list = 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++)
     {
       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_linreg_coeff_get_est (coe);
-         if (predictors[j]->type == NUMERIC)
+         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;
 }
@@ -85,8 +97,7 @@ pspp_linreg_predict (const struct variable **predictors,
 double
 pspp_linreg_residual (const struct variable **predictors,
                      const union value **vals,
-                     const union value *obs,
-                     const pspp_linreg_cache * c, int n_vals)
+                     const union value *obs, const void *c, int n_vals)
 {
   double pred;
   double result;