X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fmath%2Flinreg%2Fpredict.c;h=8e628a4dba27b475bc4c63eee2153e1383d3699b;hb=2da08e801be698df268f35ac6e21cc8a345ba1fb;hp=0bab23c8cd89f0b9bcd66ac6fb1cf69cbce72a7b;hpb=fcd8d5f89fe81347a0e4ab4e5256fb89d6bb61c1;p=pspp-builds.git

diff --git a/src/math/linreg/predict.c b/src/math/linreg/predict.c
index 0bab23c8..8e628a4d 100644
--- a/src/math/linreg/predict.c
+++ b/src/math/linreg/predict.c
@@ -1,25 +1,22 @@
-/*
-   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>
 
 /*
@@ -30,13 +27,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)
 {
+  const pspp_linreg_cache *c = c_;
   int i;
   int j;
-  const struct pspp_linreg_coeff **found;
-  const struct pspp_linreg_coeff *coe;
+  const struct pspp_coeff **found;
+  const struct pspp_coeff *coe;
   double result;
   double tmp;
 
@@ -50,27 +47,27 @@ pspp_linreg_predict (const struct variable **predictors,
       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++)
     {
       coe = pspp_linreg_get_coeff (c, predictors[j], vals[j]);
       i = 1;
-      while (found[i] != coe && i < c->n_coeffs)
+      while (found[i] == coe && i < c->n_coeffs)
 	{
 	  i++;
 	}
       if (i < c->n_coeffs)
 	{
 	  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;
 	    }
@@ -85,8 +82,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;