X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=lib%2Flinreg%2Fsweep.c;h=62dda200701ceda43e4040e3128b1b8121b9e279;hb=f1a1664ce811db565edb26e2ebab31832557e666;hp=8805840e2c4f0261af1cc3df92267919a20d626d;hpb=009350385d97d9fba2b33ea68cfe8b1aeebf1529;p=pspp
diff --git a/lib/linreg/sweep.c b/lib/linreg/sweep.c
index 8805840e2c..62dda20070 100644
--- a/lib/linreg/sweep.c
+++ b/lib/linreg/sweep.c
@@ -1,30 +1,25 @@
-/* lib/linreg/sweep.c
+/* PSPP - a program for statistical analysis.
+ Copyright (C) 2005, 2009, 2011 Free Software Foundation, Inc.
- 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 3 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 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.
- 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 . */
/*
Find the least-squares estimate of b for the linear model:
Y = Xb + Z
- where Y is an n-by-1 column vector, X is an n-by-p matrix of
+ where Y is an n-by-1 column vector, X is an n-by-p matrix of
independent variables, b is a p-by-1 vector of regression coefficients,
and Z is an n-by-1 normally-distributed random vector with independent
identically distributed components with mean 0.
@@ -43,113 +38,115 @@
Numerical Linear Algebra for Applications in Statistics. JE Gentle.
Springer. 1998. ISBN 0-387-98542-5.
- */
+*/
+
+#include
#include "sweep.h"
+#include
/*
The matrix A will be overwritten. In ordinary uses of the sweep
operator, A will be the matrix
- __ __
+ __ __
|X'X X'Y|
| |
|Y'X Y'Y|
- -- --
+ -- --
- X refers to the design matrix and Y to the vector of dependent
- observations. reg_sweep sweeps on the diagonal elements of
- X'X.
+ X refers to the design matrix and Y to the vector of dependent
+ observations. reg_sweep sweeps on the diagonal elements of
+ X'X.
- The matrix A is assumed to be symmetric, so the sweep operation is
- performed only for the upper triangle of A.
- */
+ The matrix A is assumed to be symmetric, so the sweep operation is
+ performed only for the upper triangle of A.
+
+ LAST_COL is considered to be the final column in the augmented matrix,
+ that is, the column to the right of the '=' sign of the system.
+*/
int
-reg_sweep (gsl_matrix * A)
+reg_sweep (gsl_matrix * A, int last_col)
{
- double sweep_element;
- double tmp;
int i;
int j;
int k;
gsl_matrix *B;
- if (A != NULL)
+ if (A == NULL)
+ return GSL_EFAULT;
+
+ if (A->size1 != A->size2)
+ return GSL_ENOTSQR;
+
+ assert (last_col < A->size1);
+ gsl_matrix_swap_rows (A, A->size1 - 1, last_col);
+ gsl_matrix_swap_columns (A, A->size1 - 1 , last_col);
+
+ B = gsl_matrix_alloc (A->size1, A->size2);
+ for (k = 0; k < (A->size1 - 1); k++)
{
- if (A->size1 == A->size2)
+ const double sweep_element = gsl_matrix_get (A, k, k);
+ if (fabs (sweep_element) > GSL_DBL_MIN)
{
- B = gsl_matrix_alloc (A->size1, A->size2);
- for (k = 0; k < (A->size1 - 1); k++)
+ gsl_matrix_set (B, k, k, -1.0 / sweep_element);
+ /*
+ Rows before current row k.
+ */
+ for (i = 0; i < k; i++)
{
- sweep_element = gsl_matrix_get (A, k, k);
- if (fabs (sweep_element) > GSL_DBL_MIN)
+ for (j = i; j < A->size2; j++)
{
- tmp = -1.0 / sweep_element;
- gsl_matrix_set (B, k, k, tmp);
- /*
- Rows before current row k.
- */
- for (i = 0; i < k; i++)
+ /* Use only the upper triangle of A. */
+ double tmp;
+ if (j < k)
{
- for (j = i; j < A->size2; j++)
- {
- /*
- Use only the upper triangle of A.
- */
- if (j < k)
- {
- tmp = gsl_matrix_get (A, i, j) -
- gsl_matrix_get (A, i, k)
- * gsl_matrix_get (A, j, k) / sweep_element;
- gsl_matrix_set (B, i, j, tmp);
- }
- else if (j > k)
- {
- tmp = gsl_matrix_get (A, i, j) -
- gsl_matrix_get (A, i, k)
- * gsl_matrix_get (A, k, j) / sweep_element;
- gsl_matrix_set (B, i, j, tmp);
- }
- else
- {
- tmp = gsl_matrix_get (A, i, k) / sweep_element;
- gsl_matrix_set (B, i, j, tmp);
- }
- }
+ tmp = gsl_matrix_get (A, i, j) -
+ gsl_matrix_get (A, i, k)
+ * gsl_matrix_get (A, j, k) / sweep_element;
}
- /*
- Current row k.
- */
- for (j = k + 1; j < A->size1; j++)
+ else if (j > k)
{
- tmp = gsl_matrix_get (A, k, j) / sweep_element;
- gsl_matrix_set (B, k, j, tmp);
+ tmp = gsl_matrix_get (A, i, j) -
+ gsl_matrix_get (A, i, k)
+ * gsl_matrix_get (A, k, j) / sweep_element;
}
- /*
- Rows after the current row k.
- */
- for (i = k + 1; i < A->size1; i++)
+ else
{
- for (j = i; j < A->size2; j++)
- {
- tmp = gsl_matrix_get (A, i, j) -
- gsl_matrix_get (A, k, i)
- * gsl_matrix_get (A, k, j) / sweep_element;
- gsl_matrix_set (B, i, j, tmp);
- }
+ tmp = gsl_matrix_get (A, i, k) / sweep_element;
}
+ gsl_matrix_set (B, i, j, tmp);
+ }
+ }
+ /*
+ Current row k.
+ */
+ for (j = k + 1; j < A->size1; j++)
+ {
+ double tmp = gsl_matrix_get (A, k, j) / sweep_element;
+ gsl_matrix_set (B, k, j, tmp);
+ }
+ /*
+ Rows after the current row k.
+ */
+ for (i = k + 1; i < A->size1; i++)
+ {
+ for (j = i; j < A->size2; j++)
+ {
+ double tmp = gsl_matrix_get (A, i, j) -
+ gsl_matrix_get (A, k, i)
+ * gsl_matrix_get (A, k, j) / sweep_element;
+ gsl_matrix_set (B, i, j, tmp);
}
- for (i = 0; i < A->size1; i++)
- for (j = i; j < A->size2; j++)
- {
- gsl_matrix_set (A, i, j, gsl_matrix_get (B, i, j));
- }
}
- gsl_matrix_free (B);
- return GSL_SUCCESS;
}
- return GSL_ENOTSQR;
+ gsl_matrix_memcpy (A, B);
}
- return GSL_EFAULT;
+ gsl_matrix_free (B);
+
+ gsl_matrix_swap_columns (A, A->size1 - 1 , last_col);
+ gsl_matrix_swap_rows (A, A->size1 - 1, last_col);
+
+ return GSL_SUCCESS;
}