X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fmath%2Flinreg%2Flinreg.h;h=a7d408af56bde0c605c648963882545d9bec2967;hb=b5b474193e450bba97610065df0518c08074a7fb;hp=67a422ea3fcaed0ab7497606b7f0920929de9496;hpb=e08ba3a0b4be7ebf4f049fa4ead1f0f1508bd7f8;p=pspp-builds.git
diff --git a/src/math/linreg/linreg.h b/src/math/linreg/linreg.h
index 67a422ea..a7d408af 100644
--- a/src/math/linreg/linreg.h
+++ b/src/math/linreg/linreg.h
@@ -1,22 +1,18 @@
-/*
- lib/linreg/linreg.h
-
- 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.
-*/
+/* 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 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 . */
#ifndef LINREG_H
#define LINREG_H
@@ -26,13 +22,14 @@
#include
struct variable;
-struct pspp_linreg_coeff;
+struct pspp_coeff;
union value;
enum
{
+ PSPP_LINREG_CONDITIONAL_INVERSE,
+ PSPP_LINREG_QR,
PSPP_LINREG_SWEEP,
- PSPP_LINREG_SVD
};
@@ -42,8 +39,6 @@ enum
*/
struct pspp_linreg_opts_struct
{
- int resid; /* Should the residuals be returned? */
-
int get_depvar_mean_std;
int *get_indep_mean_std; /* Array of booleans
dictating which
@@ -100,16 +95,18 @@ struct pspp_linreg_cache_struct
{
int n_obs; /* Number of observations. */
int n_indeps; /* Number of independent variables. */
- int n_coeffs;
+ int n_coeffs; /* The intercept is not considered a
+ coefficient here. */
/*
- The variable struct is ignored during estimation. It is here so
- the calling procedure can find the variable used in the model.
+ The variable struct is ignored during estimation. It is here so
+ the calling procedure can find the variable used in the model.
*/
const struct variable *depvar;
gsl_vector *residuals;
- struct pspp_linreg_coeff *coeff;
+ struct pspp_coeff **coeff;
+ double intercept;
int method; /* Method to use to estimate parameters. */
/*
Means and standard deviations of the variables.
@@ -140,8 +137,8 @@ struct pspp_linreg_cache_struct
gsl_vector *ssx; /* Centered sums of squares for independent
variables, i.e. \sum (x[i] - mean(x))^2. */
double ssy; /* Centered sums of squares for dependent
- variable.
- */
+ variable.
+ */
/*
Covariance matrix of the parameter estimates.
*/
@@ -163,8 +160,14 @@ struct pspp_linreg_cache_struct
const void *, int);
double (*residual) (const struct variable **,
const union value **,
- const union value *,
- const void *, int);
+ const union value *, const void *, int);
+ /*
+ Returns pointers to the variables used in the model.
+ */
+ int (*get_vars) (const void *, const struct variable **);
+ struct variable *resid;
+ struct variable *pred;
+
};
typedef struct pspp_linreg_cache_struct pspp_linreg_cache;
@@ -178,7 +181,7 @@ typedef struct pspp_linreg_cache_struct pspp_linreg_cache;
*/
pspp_linreg_cache *pspp_linreg_cache_alloc (size_t n, size_t p);
-bool pspp_linreg_cache_free (pspp_linreg_cache * c);
+bool pspp_linreg_cache_free (void *);
/*
Fit the linear model via least squares. All pointers passed to pspp_linreg
@@ -195,4 +198,8 @@ pspp_linreg_predict (const struct variable **, const union value **,
double
pspp_linreg_residual (const struct variable **, const union value **,
const union value *, const void *, int);
+/*
+ All variables used in the model.
+ */
+int pspp_linreg_get_vars (const void *, const struct variable **);
#endif