projects
/
pspp-builds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Apply patch #5225, assertions.
[pspp-builds.git]
/
src
/
language
/
stats
/
regression.q
diff --git
a/src/language/stats/regression.q
b/src/language/stats/regression.q
index 3f41e16aad3e5e9d489f850100b193ec649219e0..4e82a9231c6062d6a73e46c96e9e97e0451a8db9 100644
(file)
--- a/
src/language/stats/regression.q
+++ b/
src/language/stats/regression.q
@@
-57,27
+57,27
@@
/* (specification)
"REGRESSION" (regression_):
*variables=custom;
/* (specification)
"REGRESSION" (regression_):
*variables=custom;
- statistics[st_]=r,
- coeff,
- anova,
- outs,
- zpp,
- label,
- sha,
- ci,
- bcov,
- ses,
- xtx,
- collin,
- tol,
- selection,
- f,
- defaults,
- all;
+
+
statistics[st_]=r,
+
coeff,
+
anova,
+
outs,
+
zpp,
+
label,
+
sha,
+
ci,
+
bcov,
+
ses,
+
xtx,
+
collin,
+
tol,
+
selection,
+
f,
+
defaults,
+
all;
export=custom;
^dependent=varlist;
export=custom;
^dependent=varlist;
- save[sv_]=resid,pred;
- method=enter.
+
+
save[sv_]=resid,pred;
+
+
method=enter.
*/
/* (declarations) */
/* (functions) */
*/
/* (declarations) */
/* (functions) */
@@
-225,7
+225,7
@@
reg_stats_coeff (pspp_linreg_cache * c)
tab_float (t, 6, 1, 0, pval, 10, 2);
for (j = 1; j <= c->n_indeps; j++)
{
tab_float (t, 6, 1, 0, pval, 10, 2);
for (j = 1; j <= c->n_indeps; j++)
{
- v = pspp_
linreg_
coeff_get_var (c->coeff[j], 0);
+ v = pspp_coeff_get_var (c->coeff[j], 0);
label = var_to_string (v);
/* Do not overwrite the variable's name. */
strncpy (tmp, label, MAX_STRING);
label = var_to_string (v);
/* Do not overwrite the variable's name. */
strncpy (tmp, label, MAX_STRING);
@@
-237,7
+237,7
@@
reg_stats_coeff (pspp_linreg_cache * c)
for that value.
*/
for that value.
*/
- val = pspp_
linreg_
coeff_get_value (c->coeff[j], v);
+ val = pspp_coeff_get_value (c->coeff[j], v);
val_s = value_to_string (val, v);
strncat (tmp, val_s, MAX_STRING);
}
val_s = value_to_string (val, v);
strncat (tmp, val_s, MAX_STRING);
}
@@
-392,7
+392,7
@@
reg_stats_bcov (pspp_linreg_cache * c)
tab_text (t, 1, 1, TAB_CENTER | TAT_TITLE, _("Covariances"));
for (i = 1; i < c->n_coeffs; i++)
{
tab_text (t, 1, 1, TAB_CENTER | TAT_TITLE, _("Covariances"));
for (i = 1; i < c->n_coeffs; i++)
{
- const struct variable *v = pspp_
linreg_
coeff_get_var (c->coeff[i], 0);
+ const struct variable *v = pspp_coeff_get_var (c->coeff[i], 0);
label = var_to_string (v);
tab_text (t, 2, i, TAB_CENTER, label);
tab_text (t, i + 2, 0, TAB_CENTER, label);
label = var_to_string (v);
tab_text (t, 2, i, TAB_CENTER, label);
tab_text (t, i + 2, 0, TAB_CENTER, label);
@@
-728,7
+728,7
@@
reg_print_categorical_encoding (FILE * fp, pspp_linreg_cache * c)
size_t j;
int n_vars = 0;
struct variable **varlist;
size_t j;
int n_vars = 0;
struct variable **varlist;
- struct pspp_
linreg_
coeff *coeff;
+ struct pspp_coeff *coeff;
const struct variable *v;
union value *val;
const struct variable *v;
union value *val;
@@
-738,7
+738,7
@@
reg_print_categorical_encoding (FILE * fp, pspp_linreg_cache * c)
for (i = 1; i < c->n_indeps; i++) /* c->coeff[0] is the intercept. */
{
coeff = c->coeff[i];
for (i = 1; i < c->n_indeps; i++) /* c->coeff[0] is the intercept. */
{
coeff = c->coeff[i];
- v = pspp_
linreg_
coeff_get_var (coeff, 0);
+ v = pspp_coeff_get_var (coeff, 0);
if (v->type == ALPHA)
{
if (!reg_inserted (v, varlist, n_vars))
if (v->type == ALPHA)
{
if (!reg_inserted (v, varlist, n_vars))
@@
-781,18
+781,18
@@
static void
reg_print_depvars (FILE * fp, pspp_linreg_cache * c)
{
int i;
reg_print_depvars (FILE * fp, pspp_linreg_cache * c)
{
int i;
- struct pspp_
linreg_
coeff *coeff;
+ struct pspp_coeff *coeff;
const struct variable *v;
fprintf (fp, "char *model_depvars[%d] = {", c->n_indeps);
for (i = 1; i < c->n_indeps; i++)
{
coeff = c->coeff[i];
const struct variable *v;
fprintf (fp, "char *model_depvars[%d] = {", c->n_indeps);
for (i = 1; i < c->n_indeps; i++)
{
coeff = c->coeff[i];
- v = pspp_
linreg_
coeff_get_var (coeff, 0);
+ v = pspp_coeff_get_var (coeff, 0);
fprintf (fp, "\"%s\",\n\t\t", v->name);
}
coeff = c->coeff[i];
fprintf (fp, "\"%s\",\n\t\t", v->name);
}
coeff = c->coeff[i];
- v = pspp_
linreg_
coeff_get_var (coeff, 0);
+ v = pspp_coeff_get_var (coeff, 0);
fprintf (fp, "\"%s\"};\n\t", v->name);
}
static void
fprintf (fp, "\"%s\"};\n\t", v->name);
}
static void
@@
-814,7
+814,7
@@
reg_has_categorical (pspp_linreg_cache * c)
for (i = 1; i < c->n_coeffs; i++)
{
for (i = 1; i < c->n_coeffs; i++)
{
- v = pspp_
linreg_
coeff_get_var (c->coeff[i], 0);
+ v = pspp_coeff_get_var (c->coeff[i], 0);
if (v->type == ALPHA)
{
return 1;
if (v->type == ALPHA)
{
return 1;
@@
-832,7
+832,7
@@
subcommand_export (int export, pspp_linreg_cache * c)
int n_quantiles = 100;
double increment;
double tmp;
int n_quantiles = 100;
double increment;
double tmp;
- struct pspp_
linreg_
coeff *coeff;
+ struct pspp_coeff *coeff;
if (export)
{
if (export)
{
@@
-908,7
+908,7
@@
subcommand_export (int export, pspp_linreg_cache * c)
}
}
static int
}
}
static int
-regression_custom_export (struct cmd_regression *cmd UNUSED)
+regression_custom_export (struct cmd_regression *cmd UNUSED
, void *aux UNUSED
)
{
/* 0 on failure, 1 on success, 2 on failure that should result in syntax error */
if (!lex_force_match ('('))
{
/* 0 on failure, 1 on success, 2 on failure that should result in syntax error */
if (!lex_force_match ('('))
@@
-932,7
+932,7
@@
regression_custom_export (struct cmd_regression *cmd UNUSED)
int
cmd_regression (void)
{
int
cmd_regression (void)
{
- if (!parse_regression (&cmd))
+ if (!parse_regression (&cmd
, NULL
))
return CMD_FAILURE;
models = xnmalloc (cmd.n_dependent, sizeof *models);
return CMD_FAILURE;
models = xnmalloc (cmd.n_dependent, sizeof *models);
@@
-996,7
+996,8
@@
mark_missing_cases (const struct casefile *cf, struct variable *v,
/* Parser for the variables sub command */
static int
/* Parser for the variables sub command */
static int
-regression_custom_variables (struct cmd_regression *cmd UNUSED)
+regression_custom_variables (struct cmd_regression *cmd UNUSED,
+ void *aux UNUSED)
{
lex_match ('=');
{
lex_match ('=');
@@
-1212,7
+1213,7
@@
run_regression (const struct ccase *first,
and store pointers to the variables that correspond to the
coefficients.
*/
and store pointers to the variables that correspond to the
coefficients.
*/
- pspp_
linreg_
coeff_init (models[k], X);
+ pspp_coeff_init (models[k], X);
/*
Find the least-squares estimates and other statistics.
/*
Find the least-squares estimates and other statistics.