*/
#include <math/linreg/linreg.h>
-#include <math/linreg/coefficient.h>
+#include <math/coefficient.h>
#include <gl/xalloc.h>
/*
*/
double
pspp_linreg_predict (const struct variable **predictors,
- const union value **vals,
- const void *c_, int n_vals)
+ const union value **vals, const void *c_, int n_vals)
{
const pspp_linreg_cache *c = c_;
int i;
int j;
- const struct pspp_linreg_coeff **found;
- const struct pspp_linreg_coeff *coe;
+ const struct pspp_coeff **found;
+ const struct pspp_coeff *coe;
double result;
double tmp;
return c->depvar_mean;
}
found = xnmalloc (c->n_coeffs, sizeof (*found));
- *found = c->coeff;
- result = c->coeff->estimate; /* Intercept. */
+ *found = c->coeff[0];
+ result = c->coeff[0]->estimate; /* Intercept. */
/*
- The loops guard against the possibility that the caller passed us
- inadequate information, such as too few or too many values, or
- a redundant list of variable names.
+ The loops guard against the possibility that the caller passed us
+ inadequate information, such as too few or too many values, or
+ a redundant list of variable names.
*/
for (j = 0; j < n_vals; j++)
{
if (i < c->n_coeffs)
{
found[i] = coe;
- tmp = pspp_linreg_coeff_get_est (coe);
- if (predictors[j]->type == NUMERIC)
+ tmp = pspp_coeff_get_est (coe);
+ if (var_is_numeric (predictors[j]))
{
tmp *= vals[j]->f;
}
double
pspp_linreg_residual (const struct variable **predictors,
const union value **vals,
- const union value *obs,
- const void *c, int n_vals)
+ const union value *obs, const void *c, int n_vals)
{
double pred;
double result;