projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Select Cases Dialog: Convert to PsppireDialogAction
[pspp]
/
src
/
math
/
linreg.c
diff --git
a/src/math/linreg.c
b/src/math/linreg.c
index be43735785b4d2aad74595c6450e19f352fbb3f2..43f4033510515320d2e0dec430806fc16f31aa25 100644
(file)
--- a/
src/math/linreg.c
+++ b/
src/math/linreg.c
@@
-134,7
+134,6
@@
post_sweep_computations (linreg *l, gsl_matrix *sw)
gsl_matrix_view xtx;
gsl_matrix_view xmxtx;
double m;
gsl_matrix_view xtx;
gsl_matrix_view xmxtx;
double m;
- double tmp;
size_t i;
size_t j;
int rc;
size_t i;
size_t j;
int rc;
@@
-150,7
+149,7
@@
post_sweep_computations (linreg *l, gsl_matrix *sw)
m = l->depvar_mean;
for (i = 0; i < l->n_indeps; i++)
{
m = l->depvar_mean;
for (i = 0; i < l->n_indeps; i++)
{
- tmp = gsl_matrix_get (sw, i, l->n_indeps);
+
double
tmp = gsl_matrix_get (sw, i, l->n_indeps);
l->coeff[i] = tmp;
m -= tmp * linreg_get_indep_variable_mean (l, i);
}
l->coeff[i] = tmp;
m -= tmp * linreg_get_indep_variable_mean (l, i);
}
@@
-166,7
+165,7
@@
post_sweep_computations (linreg *l, gsl_matrix *sw)
for (i = 0; i < l->n_indeps; i++)
for (j = i; j < l->n_indeps; j++)
{
for (i = 0; i < l->n_indeps; i++)
for (j = i; j < l->n_indeps; j++)
{
- tmp = -1.0 * l->mse * gsl_matrix_get (sw, i, j);
+
double
tmp = -1.0 * l->mse * gsl_matrix_get (sw, i, j);
gsl_matrix_set (l->cov, i + 1, j + 1, tmp);
}
/*
gsl_matrix_set (l->cov, i + 1, j + 1, tmp);
}
/*
@@
-185,7
+184,7
@@
post_sweep_computations (linreg *l, gsl_matrix *sw)
gsl_matrix_free (xm);
if (rc == GSL_SUCCESS)
{
gsl_matrix_free (xm);
if (rc == GSL_SUCCESS)
{
- tmp = l->mse / l->n_obs;
+
double
tmp = l->mse / l->n_obs;
for (i = 1; i < 1 + l->n_indeps; i++)
{
tmp -= gsl_matrix_get (l->cov, 0, i)
for (i = 1; i < 1 + l->n_indeps; i++)
{
tmp -= gsl_matrix_get (l->cov, 0, i)
@@
-247,7
+246,7
@@
linreg_residual (const linreg *c, double obs, const double *vals, size_t n_vals)
/*
Mean of the independent variable.
*/
/*
Mean of the independent variable.
*/
-double linreg_get_indep_variable_mean (linreg *c, size_t j)
+double linreg_get_indep_variable_mean (
const
linreg *c, size_t j)
{
assert (c != NULL);
return gsl_vector_get (c->indep_means, j);
{
assert (c != NULL);
return gsl_vector_get (c->indep_means, j);
@@
-270,7
+269,6
@@
linreg_fit_qr (const gsl_matrix *cov, linreg *l)
gsl_vector *xty;
gsl_vector *tau;
gsl_vector *params;
gsl_vector *xty;
gsl_vector *tau;
gsl_vector *params;
- double tmp = 0.0;
size_t i;
size_t j;
size_t i;
size_t j;
@@
-320,10
+318,9
@@
linreg_fit_qr (const gsl_matrix *cov, linreg *l)
}
}
l->intercept = linreg_get_depvar_mean (l);
}
}
l->intercept = linreg_get_depvar_mean (l);
- tmp = 0.0;
for (i = 0; i < l->n_indeps; i++)
{
for (i = 0; i < l->n_indeps; i++)
{
- tmp = linreg_get_indep_variable_mean (l, i);
+
double
tmp = linreg_get_indep_variable_mean (l, i);
l->intercept -= l->coeff[i] * tmp;
intercept_variance += tmp * tmp * gsl_matrix_get (q, i, i);
}
l->intercept -= l->coeff[i] * tmp;
intercept_variance += tmp * tmp * gsl_matrix_get (q, i, i);
}
@@
-390,7
+387,7
@@
double linreg_intercept (const linreg *c)
return c->intercept;
}
return c->intercept;
}
-gsl_matrix *
+
const
gsl_matrix *
linreg_cov (const linreg *c)
{
return c->cov;
linreg_cov (const linreg *c)
{
return c->cov;
@@
-450,7
+447,7
@@
linreg_set_depvar_mean (linreg *c, double x)
}
double
}
double
-linreg_get_depvar_mean (linreg *c)
+linreg_get_depvar_mean (
const
linreg *c)
{
return c->depvar_mean;
}
{
return c->depvar_mean;
}