projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
case: Introduce new functions for numbers and substrings in cases.
[pspp]
/
src
/
language
/
stats
/
regression.c
diff --git
a/src/language/stats/regression.c
b/src/language/stats/regression.c
index 6fa114338eb344daca89cd15bf0a1041491548ef..7c98dba047b94ca3d278890e68885d08fa48fb71 100644
(file)
--- a/
src/language/stats/regression.c
+++ b/
src/language/stats/regression.c
@@
-175,14
+175,14
@@
save_trans_func (void *aux, struct ccase **c, casenumber x UNUSED)
{
if (ws->pred_idx != -1)
{
{
if (ws->pred_idx != -1)
{
- double pred = case_
data_idx (in, ws->extras * k + ws->pred_idx)->f
;
-
case_data_rw (*c, ws->predvars[k])->f
= pred;
+ double pred = case_
num_idx (in, ws->extras * k + ws->pred_idx)
;
+
*case_num_rw (*c, ws->predvars[k])
= pred;
}
if (ws->res_idx != -1)
{
}
if (ws->res_idx != -1)
{
- double resid = case_
data_idx (in, ws->extras * k + ws->res_idx)->f
;
-
case_data_rw (*c, ws->residvars[k])->f
= resid;
+ double resid = case_
num_idx (in, ws->extras * k + ws->res_idx)
;
+
*case_num_rw (*c, ws->residvars[k])
= resid;
}
}
case_unref (in);
}
}
case_unref (in);
@@
-827,14
+827,14
@@
run_regression (const struct regression *cmd,
if (cmd->pred)
{
double pred = linreg_predict (models[k], vals, n_indep);
if (cmd->pred)
{
double pred = linreg_predict (models[k], vals, n_indep);
-
case_data_rw_idx (outc, k * ws->extras + ws->pred_idx)->f
= pred;
+
*case_num_rw_idx (outc, k * ws->extras + ws->pred_idx)
= pred;
}
if (cmd->resid)
{
}
if (cmd->resid)
{
- double obs = case_
data (c, linreg_dep_var (models[k]))->f
;
+ double obs = case_
num (c, linreg_dep_var (models[k]))
;
double res = linreg_residual (models[k], obs, vals, n_indep);
double res = linreg_residual (models[k], obs, vals, n_indep);
-
case_data_rw_idx (outc, k * ws->extras + ws->res_idx)->f
= res;
+
*case_num_rw_idx (outc, k * ws->extras + ws->res_idx)
= res;
}
free (vals);
free (vars);
}
free (vals);
free (vars);