projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Constness
[pspp]
/
src
/
language
/
stats
/
quick-cluster.c
diff --git
a/src/language/stats/quick-cluster.c
b/src/language/stats/quick-cluster.c
index 10572cee5e260a8a1590c56742489586741f1053..e6987f4b10b5db503a799b66665a796665407a17 100644
(file)
--- a/
src/language/stats/quick-cluster.c
+++ b/
src/language/stats/quick-cluster.c
@@
-227,11
+227,12
@@
kmeans_recalculate_centers (struct Kmeans *kmeans, const struct casereader *read
{
const union value *val = case_data (c, qc->vars[v]);
double x = val->f * weight;
{
const union value *val = case_data (c, qc->vars[v]);
double x = val->f * weight;
+ double curval;
if ( var_is_value_missing (qc->vars[v], val, qc->exclude))
continue;
if ( var_is_value_missing (qc->vars[v], val, qc->exclude))
continue;
-
double
curval = gsl_matrix_get (kmeans->centers, index, v);
+ curval = gsl_matrix_get (kmeans->centers, index, v);
gsl_matrix_set (kmeans->centers, index, v, curval + x);
}
i++;
gsl_matrix_set (kmeans->centers, index, v, curval + x);
}
i++;
@@
-528,6
+529,10
@@
cmd_quick_cluster (struct lexer *lexer, struct dataset *ds)
{
qc.exclude = MV_SYSTEM;
}
{
qc.exclude = MV_SYSTEM;
}
+ else if (lex_match_id (lexer, "EXCLUDE"))
+ {
+ qc.exclude = MV_ANY;
+ }
else
goto error;
}
else
goto error;
}