projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
sort: Add support for combining cases with identical sort criteria.
[pspp]
/
src
/
language
/
stats
/
median.c
diff --git
a/src/language/stats/median.c
b/src/language/stats/median.c
index a894f017a708d8994f1ddd79feee31f573185c00..20e414259fd42d573b76e92595ccd4305bc21c64 100644
(file)
--- a/
src/language/stats/median.c
+++ b/
src/language/stats/median.c
@@
-313,6
+313,7
@@
show_frequencies (const struct n_sample_test *nst, const struct results *results
const int nr = column_headers + nst->n_vars * 2;
struct tab_table *table = tab_create (nc, nr);
const int nr = column_headers + nst->n_vars * 2;
struct tab_table *table = tab_create (nc, nr);
+ tab_set_format (table, RC_WEIGHT, wfmt);
tab_headers (table, row_headers, 0, column_headers, 0);
tab_headers (table, row_headers, 0, column_headers, 0);
@@
-373,10
+374,10
@@
show_frequencies (const struct n_sample_test *nst, const struct results *results
{
const struct val_node *vn = rs->sorted_array[i];
tab_double (table, row_headers + i, column_headers + v * 2,
{
const struct val_node *vn = rs->sorted_array[i];
tab_double (table, row_headers + i, column_headers + v * 2,
- 0, vn->gt,
wfmt
);
+ 0, vn->gt,
NULL, RC_WEIGHT
);
tab_double (table, row_headers + i, column_headers + v * 2 + 1,
tab_double (table, row_headers + i, column_headers + v * 2 + 1,
-
0, vn->le, wfmt
);
+
0, vn->le, NULL, RC_WEIGHT
);
}
}
}
}
@@
-401,6
+402,7
@@
show_test_statistics (const struct n_sample_test *nst,
const int nr = column_headers + nst->n_vars;
struct tab_table *table = tab_create (nc, nr);
const int nr = column_headers + nst->n_vars;
struct tab_table *table = tab_create (nc, nr);
+ tab_set_format (table, RC_WEIGHT, wfmt);
tab_headers (table, row_headers, 0, column_headers, 0);
tab_headers (table, row_headers, 0, column_headers, 0);
@@
-438,19
+440,19
@@
show_test_statistics (const struct n_sample_test *nst,
tab_double (table, row_headers + 0, column_headers + v,
tab_double (table, row_headers + 0, column_headers + v,
- 0, rs->n,
wfmt
);
+ 0, rs->n,
NULL, RC_WEIGHT
);
tab_double (table, row_headers + 1, column_headers + v,
tab_double (table, row_headers + 1, column_headers + v,
- 0, rs->median, NULL);
+ 0, rs->median, NULL
, RC_OTHER
);
tab_double (table, row_headers + 2, column_headers + v,
tab_double (table, row_headers + 2, column_headers + v,
- 0, rs->chisq, NULL);
+ 0, rs->chisq, NULL
, RC_OTHER
);
tab_double (table, row_headers + 3, column_headers + v,
tab_double (table, row_headers + 3, column_headers + v,
- 0, df,
wfmt
);
+ 0, df,
NULL, RC_WEIGHT
);
tab_double (table, row_headers + 4, column_headers + v,
tab_double (table, row_headers + 4, column_headers + v,
- 0, gsl_cdf_chisq_Q (rs->chisq, df), NULL);
+ 0, gsl_cdf_chisq_Q (rs->chisq, df), NULL
, RC_PVALUE
);
}
tab_submit (table);
}
tab_submit (table);