projects
/
pspp-builds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge master into output branch.
[pspp-builds.git]
/
src
/
language
/
stats
/
wilcoxon.c
diff --git
a/src/language/stats/wilcoxon.c
b/src/language/stats/wilcoxon.c
index 310206c0e7bf88961e820c05f97831f8568da5a6..c7e302779e63a8937c64a707eeb74126823e948c 100644
(file)
--- a/
src/language/stats/wilcoxon.c
+++ b/
src/language/stats/wilcoxon.c
@@
-225,9
+225,9
@@
show_ranks_box (const struct wilcoxon_state *ws,
const struct variable *wv = dict_get_weight (dict);
const struct fmt_spec *wfmt = wv ? var_get_print_format (wv) : & F_8_0;
const struct variable *wv = dict_get_weight (dict);
const struct fmt_spec *wfmt = wv ? var_get_print_format (wv) : & F_8_0;
- struct tab_table *table = tab_create (5, 1 + 4 * t2s->n_pairs
, 0
);
+ struct tab_table *table = tab_create (5, 1 + 4 * t2s->n_pairs);
- tab_dim (table, tab_natural_dimensions, NULL);
+ tab_dim (table, tab_natural_dimensions, NULL
, NULL
);
tab_title (table, _("Ranks"));
tab_title (table, _("Ranks"));
@@
-235,11
+235,11
@@
show_ranks_box (const struct wilcoxon_state *ws,
/* Vertical lines inside the box */
tab_box (table, 0, 0, -1, TAL_1,
/* Vertical lines inside the box */
tab_box (table, 0, 0, -1, TAL_1,
- 1, 0, tab
le->nc
- 1, tab_nr (table) - 1 );
+ 1, 0, tab
_nc (table)
- 1, tab_nr (table) - 1 );
/* Box around entire table */
tab_box (table, TAL_2, TAL_2, -1, -1,
/* Box around entire table */
tab_box (table, TAL_2, TAL_2, -1, -1,
- 0, 0, tab
le->nc
- 1, tab_nr (table) - 1 );
+ 0, 0, tab
_nc (table)
- 1, tab_nr (table) - 1 );
tab_text (table, 2, 0, TAB_CENTER, _("N"));
tab_text (table, 2, 0, TAB_CENTER, _("N"));
@@
-261,7
+261,7
@@
show_ranks_box (const struct wilcoxon_state *ws,
tab_text (table, 1, 3 + i * 4, TAB_LEFT, _("Ties"));
tab_text (table, 1, 4 + i * 4, TAB_LEFT, _("Total"));
tab_text (table, 1, 3 + i * 4, TAB_LEFT, _("Ties"));
tab_text (table, 1, 4 + i * 4, TAB_LEFT, _("Total"));
- tab_hline (table, TAL_1, 0, tab
le->nc
- 1, 1 + i * 4);
+ tab_hline (table, TAL_1, 0, tab
_nc (table)
- 1, 1 + i * 4);
tab_text (table, 0, 1 + i * 4, TAB_LEFT, ds_cstr (&pair_name));
tab_text (table, 0, 1 + i * 4, TAB_LEFT, ds_cstr (&pair_name));
@@
-290,8
+290,8
@@
show_ranks_box (const struct wilcoxon_state *ws,
}
}
- tab_hline (table, TAL_2, 0, tab
le->nc
- 1, 1);
- tab_vline (table, TAL_2, 2, 0, tab
le->nr
- 1);
+ tab_hline (table, TAL_2, 0, tab
_nc (table)
- 1, 1);
+ tab_vline (table, TAL_2, 2, 0, tab
_nr (table)
- 1);
tab_submit (table);
tab_submit (table);
@@
-306,9
+306,9
@@
show_tests_box (const struct wilcoxon_state *ws,
)
{
size_t i;
)
{
size_t i;
- struct tab_table *table = tab_create (1 + t2s->n_pairs, exact ? 5 : 3
, 0
);
+ struct tab_table *table = tab_create (1 + t2s->n_pairs, exact ? 5 : 3);
- tab_dim (table, tab_natural_dimensions, NULL);
+ tab_dim (table, tab_natural_dimensions, NULL
, NULL
);
tab_title (table, _("Test Statistics"));
tab_title (table, _("Test Statistics"));
@@
-316,11
+316,11
@@
show_tests_box (const struct wilcoxon_state *ws,
/* Vertical lines inside the box */
tab_box (table, 0, 0, -1, TAL_1,
/* Vertical lines inside the box */
tab_box (table, 0, 0, -1, TAL_1,
- 0, 0, tab
le->nc
- 1, tab_nr (table) - 1 );
+ 0, 0, tab
_nc (table)
- 1, tab_nr (table) - 1 );
/* Box around entire table */
tab_box (table, TAL_2, TAL_2, -1, -1,
/* Box around entire table */
tab_box (table, TAL_2, TAL_2, -1, -1,
- 0, 0, tab
le->nc
- 1, tab_nr (table) - 1 );
+ 0, 0, tab
_nc (table)
- 1, tab_nr (table) - 1 );
tab_text (table, 0, 1, TAB_LEFT, _("Z"));
tab_text (table, 0, 1, TAB_LEFT, _("Z"));
@@
-377,8
+377,8
@@
show_tests_box (const struct wilcoxon_state *ws,
}
}
}
}
- tab_hline (table, TAL_2, 0, tab
le->nc
- 1, 1);
- tab_vline (table, TAL_2, 1, 0, tab
le->nr
- 1);
+ tab_hline (table, TAL_2, 0, tab
_nc (table)
- 1, 1);
+ tab_vline (table, TAL_2, 1, 0, tab
_nr (table)
- 1);
tab_submit (table);
tab_submit (table);