X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?p=pspp-builds.git;a=blobdiff_plain;f=src%2Fmath%2Flinreg.c;h=6a0d57f4c3eb20bb67026ff2c36959580cac4174;hp=c5ecf5ac9495ba10ccd7fa3bc1372a93224cf71c;hb=e385eeb8a2ea75fb2d9c1c628619baa03c914dae;hpb=b3ec9f11b5ebe965d2233870ced536a75709451d diff --git a/src/math/linreg.c b/src/math/linreg.c index c5ecf5ac..6a0d57f4 100644 --- a/src/math/linreg.c +++ b/src/math/linreg.c @@ -72,7 +72,7 @@ linreg_alloc (const struct variable *depvar, const struct variable **indep_vars, linreg *c; size_t i; - c = xmalloc (sizeof (linreg)); + c = xmalloc (sizeof (*c)); c->depvar = depvar; c->indep_vars = xnmalloc (p, sizeof (*indep_vars)); for (i = 0; i < p; i++) @@ -100,8 +100,8 @@ linreg_alloc (const struct variable *depvar, const struct variable **indep_vars, Default settings. */ c->method = LINREG_SWEEP; - c->resid = NULL; /* The variable storing my residuals. */ - c->pred = NULL; /* The variable storing my predicted values. */ + c->pred = NULL; + c->resid = NULL; return c; } @@ -365,6 +365,7 @@ linreg_fit (const gsl_matrix *cov, linreg *l) params = gsl_matrix_calloc (cov->size1, cov->size2); gsl_matrix_memcpy (params, cov); + l->sst = gsl_matrix_get (cov, cov->size1 - 1, cov->size2 - 1); if (l->method == LINREG_SWEEP) { @@ -419,10 +420,21 @@ linreg_n_obs (const linreg *c) return c->n_obs; } +double +linreg_sse (const linreg *c) +{ + return c->sse; +} + double linreg_ssreg (const linreg *c) { - return c->ssm; + return (c->sst - c->sse); +} + +double linreg_sst (const linreg *c) +{ + return c->sst; } double