X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fmath%2Flinreg%2Flinreg.c;h=3c086a98f22ce1868ac581e1cdc4bc359671483f;hb=c17ea35a73b7a690a54c5c6a213de19f0376e74f;hp=6c433e68b3d5774e0606ac3f32b22fe24da580dd;hpb=f5c108becd49d78f4898cab11352291f5689d24e;p=pspp-builds.git diff --git a/src/math/linreg/linreg.c b/src/math/linreg/linreg.c index 6c433e68..3c086a98 100644 --- a/src/math/linreg/linreg.c +++ b/src/math/linreg/linreg.c @@ -1,22 +1,18 @@ -/* - lib/linreg/linreg.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. 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 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. + 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. - */ + You should have received a copy of the GNU General Public License + along with this program. If not, see . */ #include #include @@ -114,7 +110,7 @@ pspp_linreg_get_vars (const void *c_, const struct variable **v) /* Start at c->coeff[1] to avoid the intercept. */ - v[result] = pspp_coeff_get_var (c->coeff[1], 0); + v[result] = pspp_coeff_get_var (c->coeff[1], 0); result = (v[result] == NULL) ? 0 : 1; for (coef = c->coeff[2]; coef < c->coeff[c->n_coeffs]; coef++) @@ -370,6 +366,18 @@ pspp_linreg (const gsl_vector * Y, const gsl_matrix * X, } gsl_matrix_free (sw); } + else if (cache->method == PSPP_LINREG_CONDITIONAL_INVERSE) + { + /* + Use the SVD of X^T X to find a conditional inverse of X^TX. If + the SVD is X^T X = U D V^T, then set the conditional inverse + to (X^T X)^c = V D^- U^T. D^- is defined as follows: If entry + (i, i) has value sigma_i, then entry (i, i) of D^- is 1 / + sigma_i if sigma_i > 0, and 0 otherwise. Then solve the normal + equations by setting the estimated parameter vector to + (X^TX)^c X^T Y. + */ + } else { gsl_multifit_linear_workspace *wk;