pspp_linreg_get_vars (const void *c_, const struct variable **v)
{
const pspp_linreg_cache *c = c_;
- struct pspp_coeff *coef = NULL;
const struct variable *tmp;
int i;
+ int j;
int result = 0;
/*
{
v[i] = NULL;
}
- /*
- Start at c->coeff[1] to avoid the intercept.
- */
- v[result] = pspp_coeff_get_var (c->coeff[1], 0);
- result = (v[result] == NULL) ? 0 : 1;
-
- for (coef = c->coeff[2]; coef < c->coeff[c->n_coeffs]; coef++)
+ for (j = 0; j < c->n_coeffs; j++)
{
- tmp = pspp_coeff_get_var (coef, 0);
+ tmp = pspp_coeff_get_var (c->coeff[j], 0);
assert (tmp != NULL);
/* Repeated variables are likely to bunch together, at the end
of the array. */
cache->dft = cache->n_obs - 1;
cache->dfm = cache->n_indeps;
cache->dfe = cache->dft - cache->dfm;
- cache->n_coeffs = X->size2 + 1; /* Adjust this later to allow for
- regression through the origin.
- */
+ cache->n_coeffs = X->size2;
+ cache->intercept = 0.0;
+
if (cache->method == PSPP_LINREG_SWEEP)
{
gsl_matrix *sw;
for (i = 0; i < cache->n_indeps; i++)
{
tmp = gsl_matrix_get (sw, i, cache->n_indeps);
- cache->coeff[i + 1]->estimate = tmp;
+ cache->coeff[i]->estimate = tmp;
m -= tmp * gsl_vector_get (cache->indep_means, i);
}
/*
}
gsl_matrix_set (cache->cov, 0, 0, tmp);
- cache->coeff[0]->estimate = m;
+ cache->intercept = m;
}
else
{
cache->cov, &(cache->sse), wk);
for (i = 0; i < cache->n_coeffs; i++)
{
- cache->coeff[i]->estimate = gsl_vector_get (param_estimates, i);
+ cache->coeff[i]->estimate = gsl_vector_get (param_estimates, i + 1);
}
+ cache->intercept = gsl_vector_get (param_estimates, 0);
if (rc == GSL_SUCCESS)
{
gsl_multifit_linear_free (wk);