added residual function to linreg struct; tidied up

diff --git a/src/math/linreg/coefficient.c b/src/math/linreg/coefficient.c
index 4390894d3c43244d37204db6f6ed8b526a83cf9a..4010b72d308b039bac804d60fe39c7fc30f923fd 100644 (file)
--- a/src/math/linreg/coefficient.c
+++ b/src/math/linreg/coefficient.c
@@ -1,22 +1,22 @@
 /*
- * lib/linreg/coefficient.c
- * 
- * Copyright (C) 2005 Free Software Foundation, Inc. Written by Jason H Stover.
- * 
- * 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.
- */
+  lib/linreg/coefficient.c
+  
+  Copyright (C) 2005 Free Software Foundation, Inc. Written by Jason H Stover.
+  
+  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.
+*/
 
 /*
   Accessor functions for matching coefficients and variables.
@@ -31,14 +31,14 @@
 struct varinfo
 {
   const struct variable *v;    /* Variable associated with this
-                                * coefficient. Note this variable
-                                * may not be unique. In other words,
-                                * a coefficient structure may have
-                                * other v_info's, each with its own
-                                * variable. */
+                                  coefficient. Note this variable
+                                  may not be unique. In other words,
+                                  a coefficient structure may have
+                                  other v_info's, each with its own
+                                  variable. */
   const union value *val;      /* Value of the variable v which this varinfo
-                                * refers to. This member is relevant only to
-                                * categorical variables. */
+                                  refers to. This member is relevant only to
+                                  categorical variables. */
 };
 
 void
@@ -189,8 +189,8 @@ pspp_linreg_get_coeff (const pspp_linreg_cache * c,
                       const struct variable *v, const union value *val)
 {
   int i = 1;
-  struct pspp_linreg_coeff *result;
-  const struct variable *tmp;
+  struct pspp_linreg_coeff *result = NULL;
+  const struct variable *tmp = NULL;
 
   if (c == NULL)
     {

diff --git a/src/math/linreg/linreg.c b/src/math/linreg/linreg.c
index 0406cad2183778097fc1783d016b1ad0c1c3eaa8..99d37c13ab211a86b44f1791f5d89df93eea5659 100644 (file)
--- a/src/math/linreg/linreg.c
+++ b/src/math/linreg/linreg.c
@@ -115,6 +115,7 @@ pspp_linreg_cache_alloc (size_t n, size_t p)
    */
   c->method = PSPP_LINREG_SWEEP;
   c->predict = pspp_linreg_predict;
+  c->residual = pspp_linreg_residual;
 
   return c;
 }

diff --git a/src/math/linreg/linreg.h b/src/math/linreg/linreg.h
index 940476424cbdb15d6f0b48f890c08fd41eba5c63..771236a80e9e33cea19a053d34c73ada58aa3a1c 100644 (file)
--- a/src/math/linreg/linreg.h
+++ b/src/math/linreg/linreg.h
@@ -161,6 +161,10 @@ struct pspp_linreg_cache_struct
 
   double (*predict) (const struct variable **, const union value **,
                     const void *, int);
+  double (*residual) (const struct variable **,
+                     const union value **,
+                     const union value *,
+                     const void *, int);
 };
 
 typedef struct pspp_linreg_cache_struct pspp_linreg_cache;
@@ -189,6 +193,6 @@ double
 pspp_linreg_predict (const struct variable **, const union value **,
                     const pspp_linreg_cache *, int);
 double
-pspp_linreg_residual (const struct variable *, const union value **,
+pspp_linreg_residual (const struct variable **, const union value **,
                      const union value *, const pspp_linreg_cache *, int);
 #endif

diff --git a/src/math/linreg/predict.c b/src/math/linreg/predict.c
index a4bbcf9d676dbcb45fc4a439149d5c7aa9fc7a55..0bab23c8cd89f0b9bcd66ac6fb1cf69cbce72a7b 100644 (file)
--- a/src/math/linreg/predict.c
+++ b/src/math/linreg/predict.c
@@ -1,26 +1,26 @@
-/* lib/linreg/predict.c
-
- Copyright (C) 2005 Free Software Foundation, Inc.
- Written by Jason H. Stover.
-
- 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.
+/*
+   lib/linreg/predict.c
+  
+   Copyright (C) 2005 Free Software Foundation, Inc. Written by Jason H. Stover.
 
- 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 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.
+ */
 
 #include <math/linreg/linreg.h>
 #include <math/linreg/coefficient.h>
+#include <gl/xalloc.h>
 
 /*
   Predict the value of the dependent variable with the
@@ -29,15 +29,17 @@
   in the same order.
  */
 double
-pspp_linreg_predict (const struct variable **predictors, 
-                    const union value **vals, 
-                    const pspp_linreg_cache *c,
-                    int n_vals)
+pspp_linreg_predict (const struct variable **predictors,
+                    const union value **vals,
+                    const pspp_linreg_cache * c, int n_vals)
 {
   int i;
+  int j;
+  const struct pspp_linreg_coeff **found;
+  const struct pspp_linreg_coeff *coe;
   double result;
   double tmp;
-  
+
   if (predictors == NULL || vals == NULL || c == NULL)
     {
       return GSL_NAN;
@@ -47,32 +49,44 @@ pspp_linreg_predict (const struct variable **predictors,
       /* The stupid model: just guess the mean. */
       return c->depvar_mean;
     }
-  result = c->coeff->estimate; /* Intercept. */
+  found = xnmalloc (c->n_coeffs, sizeof (*found));
+  *found = c->coeff;
+  result = c->coeff->estimate; /* Intercept. */
 
   /*
-    Stop at the minimum of c->n_coeffs and n_vals in case
-    the caller passed us inadequate information, such as too
-    few or too many values.
+    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.
    */
-  n_vals++;
-  for (i = 1; i < c->n_coeffs && i < n_vals; i++)
+  for (j = 0; j < n_vals; j++)
     {
-      tmp = pspp_linreg_coeff_get_est (pspp_linreg_get_coeff (c, predictors[i], vals[i]));
-      if (predictors[i]->type == NUMERIC)
+      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)
        {
-         tmp *= vals[i]->f;
+         found[i] = coe;
+         tmp = pspp_linreg_coeff_get_est (coe);
+         if (predictors[j]->type == NUMERIC)
+           {
+             tmp *= vals[j]->f;
+           }
+         result += tmp;
        }
-      result += tmp;
     }
+  free (found);
+
   return result;
 }
 
 double
-pspp_linreg_residual (const struct variable *predictors,
+pspp_linreg_residual (const struct variable **predictors,
                      const union value **vals,
                      const union value *obs,
-                     const pspp_linreg_cache *c,
-                     int n_vals)
+                     const pspp_linreg_cache * c, int n_vals)
 {
   double pred;
   double result;
@@ -81,9 +95,8 @@ pspp_linreg_residual (const struct variable *predictors,
     {
       return GSL_NAN;
     }
-  
   pred = pspp_linreg_predict (predictors, vals, c, n_vals);
-  
+
   result = gsl_isnan (pred) ? GSL_NAN : (obs->f - pred);
   return result;
 }