projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix memory leak in rank_sorted_casefile().
[pspp]
/
src
/
math
/
linreg
/
linreg.h
diff --git
a/src/math/linreg/linreg.h
b/src/math/linreg/linreg.h
index a3b0c780e24023e261d34542d8ac4f1f3d373576..c5f5ef10ba24e944e91f548b37bf01621a85358a 100644
(file)
--- a/
src/math/linreg/linreg.h
+++ b/
src/math/linreg/linreg.h
@@
-26,7
+26,7
@@
#include <gsl/gsl_matrix.h>
struct variable;
#include <gsl/gsl_matrix.h>
struct variable;
-struct pspp_
linreg_
coeff;
+struct pspp_coeff;
union value;
enum
union value;
enum
@@
-42,8
+42,6
@@
enum
*/
struct pspp_linreg_opts_struct
{
*/
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
int get_depvar_mean_std;
int *get_indep_mean_std; /* Array of booleans
dictating which
@@
-103,13
+101,13
@@
struct pspp_linreg_cache_struct
int n_coeffs;
/*
int n_coeffs;
/*
- 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;
*/
const struct variable *depvar;
gsl_vector *residuals;
- struct pspp_
linreg_coeff
*coeff;
+ struct pspp_
coeff *
*coeff;
int method; /* Method to use to estimate parameters. */
/*
Means and standard deviations of the variables.
int method; /* Method to use to estimate parameters. */
/*
Means and standard deviations of the variables.
@@
-141,7
+139,7
@@
struct pspp_linreg_cache_struct
variables, i.e. \sum (x[i] - mean(x))^2. */
double ssy; /* Centered sums of squares for dependent
variable.
variables, i.e. \sum (x[i] - mean(x))^2. */
double ssy; /* Centered sums of squares for dependent
variable.
- */
+
*/
/*
Covariance matrix of the parameter estimates.
*/
/*
Covariance matrix of the parameter estimates.
*/
@@
-163,8
+161,14
@@
struct pspp_linreg_cache_struct
const void *, int);
double (*residual) (const struct variable **,
const union value **,
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 *, struct variable **);
+ struct variable *resid;
+ struct variable *pred;
+
};
typedef struct pspp_linreg_cache_struct pspp_linreg_cache;
};
typedef struct pspp_linreg_cache_struct pspp_linreg_cache;
@@
-195,4
+199,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);
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 *, struct variable **);
#endif
#endif