projects
/
pspp-builds.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
0a30147
)
Added var structs to allow easier lookup of model variables
author
Jason Stover
<jhs@math.gcsu.edu>
Wed, 26 Oct 2005 19:29:18 +0000
(19:29 +0000)
committer
Jason Stover
<jhs@math.gcsu.edu>
Wed, 26 Oct 2005 19:29:18 +0000
(19:29 +0000)
lib/linreg/pspp_linreg.h
patch
|
blob
|
history
diff --git
a/lib/linreg/pspp_linreg.h
b/lib/linreg/pspp_linreg.h
index 92e78a0f24b3b853f094b76cf75d8f10371d781d..5fa4e63bc45c06c4166e741bb5e6f9c01825bea0 100644
(file)
--- a/
lib/linreg/pspp_linreg.h
+++ b/
lib/linreg/pspp_linreg.h
@@
-54,6
+54,7
@@
#include <gsl/gsl_multifit.h>
#include <gsl/gsl_blas.h>
#include <gsl/gsl_cblas.h>
#include <gsl/gsl_multifit.h>
#include <gsl/gsl_blas.h>
#include <gsl/gsl_cblas.h>
+#include <src/var.h>
enum
{
PSPP_LINREG_SWEEP,
enum
{
PSPP_LINREG_SWEEP,
@@
-70,8
+71,14
@@
struct pspp_linreg_cache_struct
{
int n_obs; /* Number of observations. */
int n_indeps; /* Number of independent variables. */
{
int n_obs; /* Number of observations. */
int n_indeps; /* Number of independent variables. */
- gsl_vector *depvar;
- gsl_matrix *indepvar;
+
+ /*
+ The var structs are ignored during estimation.
+ They are here so the calling procedures can
+ find the variables used in the model.
+ */
+ struct var *depvar;
+ struct var **indepvar;
gsl_vector *residuals;
gsl_vector *param_estimates;
int method; /* Method to use to estimate parameters. */
gsl_vector *residuals;
gsl_vector *param_estimates;
int method; /* Method to use to estimate parameters. */
@@
-81,8
+88,8
@@
struct pspp_linreg_cache_struct
called, pspp_linreg() will compute their values.
Entry i of indep_means is the mean of independent
called, pspp_linreg() will compute their values.
Entry i of indep_means is the mean of independent
- variable i, whose observations are stored in
column i
-
of indepvar
.
+ variable i, whose observations are stored in
the ith
+
column of the design matrix
.
*/
double depvar_mean;
double depvar_std;
*/
double depvar_mean;
double depvar_std;