projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
A few basic tests pass.
[pspp]
/
src
/
language
/
stats
/
ctables.c
diff --git
a/src/language/stats/ctables.c
b/src/language/stats/ctables.c
index af53a6b6c53643a9d577a0b06a01d43e5db06880..6b6b46a035239564d3a54c43d353a9bcf06c84f1 100644
(file)
--- a/
src/language/stats/ctables.c
+++ b/
src/language/stats/ctables.c
@@
-1925,7
+1925,8
@@
ctables_summary_add (union ctables_summary *s,
case CTSF_LAYERPCT_SUM:
case CTSF_LAYERROWPCT_SUM:
case CTSF_LAYERCOLPCT_SUM:
case CTSF_LAYERPCT_SUM:
case CTSF_LAYERROWPCT_SUM:
case CTSF_LAYERCOLPCT_SUM:
- moments1_add (s->moments, value->f, weight);
+ if (!var_is_value_missing (var, value))
+ moments1_add (s->moments, value->f, weight);
break;
case CTSF_MEDIAN:
break;
case CTSF_MEDIAN:
@@
-2678,13
+2679,11
@@
ctables_table_output (struct ctables *ct, struct ctables_table *t)
if (new_subtable)
{
n_levels = 0;
if (new_subtable)
{
n_levels = 0;
- printf ("%s levels:", pivot_axis_type_to_string (a));
for (size_t k = 0; k < nest->n; k++)
{
enum ctables_vlabel vlabel = ct->vlabels[var_get_dict_index (nest->vars[k])];
if (vlabel != CTVL_NONE)
{
for (size_t k = 0; k < nest->n; k++)
{
enum ctables_vlabel vlabel = ct->vlabels[var_get_dict_index (nest->vars[k])];
if (vlabel != CTVL_NONE)
{
- printf (" var(%s)", var_get_name (nest->vars[k]));
levels[n_levels++] = (struct ctables_level) {
.type = CTL_VAR,
.var_idx = k,
levels[n_levels++] = (struct ctables_level) {
.type = CTL_VAR,
.var_idx = k,
@@
-2694,7
+2693,6
@@
ctables_table_output (struct ctables *ct, struct ctables_table *t)
if (nest->scale_idx != k
&& (k != nest->n - 1 || t->label_axis[a] == a))
{
if (nest->scale_idx != k
&& (k != nest->n - 1 || t->label_axis[a] == a))
{
- printf (" category(%s)", var_get_name (nest->vars[k]));
levels[n_levels++] = (struct ctables_level) {
.type = CTL_CATEGORY,
.var_idx = k,
levels[n_levels++] = (struct ctables_level) {
.type = CTL_CATEGORY,
.var_idx = k,
@@
-2704,13
+2702,11
@@
ctables_table_output (struct ctables *ct, struct ctables_table *t)
if (a == t->slabels_axis && a == t->summary_axis)
{
if (a == t->slabels_axis && a == t->summary_axis)
{
- printf (" summary");
levels[n_levels++] = (struct ctables_level) {
.type = CTL_SUMMARY,
.var_idx = SIZE_MAX,
};
}
levels[n_levels++] = (struct ctables_level) {
.type = CTL_SUMMARY,
.var_idx = SIZE_MAX,
};
}
- printf ("\n");
}
size_t n_common = 0;
}
size_t n_common = 0;