X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Flanguage%2Fstats%2Ft-test.q;h=9e332df87be2a9bcb1f88e74aefc0d96ea8018d0;hb=92f198d13c9214c0d75b936f0ea0dc2684ea914b;hp=c558d60acc1be8ad1d08ce94b156260148b8e28c;hpb=a19b858e0ac3c69e4a28c0ca6d8674427268a863;p=pspp diff --git a/src/language/stats/t-test.q b/src/language/stats/t-test.q index c558d60acc..9e332df87b 100644 --- a/src/language/stats/t-test.q +++ b/src/language/stats/t-test.q @@ -20,31 +20,36 @@ 02110-1301, USA. */ #include + #include -#include +#include #include #include -#include -#include + #include #include +#include +#include +#include +#include #include +#include +#include +#include +#include #include -#include -#include -#include #include -#include -#include #include +#include +#include #include -#include "size_max.h" -#include #include +#include +#include +#include #include -#include -#include -#include + +#include "size_max.h" #include "gettext.h" #define _(msgid) gettext (msgid) @@ -55,11 +60,11 @@ "T-TEST" (tts_): +groups=custom; testval=double; - variables=varlist("PV_NO_SCRATCH | PV_NUMERIC"); - pairs=custom; - +missing=miss:!analysis/listwise, - incl:include/!exclude; - format=fmt:!labels/nolabels; + +variables=varlist("PV_NO_SCRATCH | PV_NUMERIC"); + +pairs=custom; + missing=miss:!analysis/listwise, + incl:include/!exclude; + +format=fmt:!labels/nolabels; criteria=:cin(d:criteria,"%s > 0. && %s < 1."). */ /* (declarations) */ @@ -230,7 +235,8 @@ static int group_calc (const struct ccase *, struct cmd_t_test *); static void group_postcalc (struct cmd_t_test *); -static bool calculate(const struct casefile *cf, void *_mode); +static bool calculate(const struct ccase *first, + const struct casefile *cf, void *_mode); static int mode; @@ -254,7 +260,7 @@ cmd_t_test(void) { bool ok; - if ( !parse_t_test(&cmd) ) + if ( !parse_t_test(&cmd, NULL) ) return CMD_FAILURE; if (! cmd.sbc_criteria) @@ -361,7 +367,7 @@ cmd_t_test(void) } static int -tts_custom_groups (struct cmd_t_test *cmd UNUSED) +tts_custom_groups (struct cmd_t_test *cmd UNUSED, void *aux UNUSED) { int n_group_values=0; @@ -440,7 +446,7 @@ tts_custom_groups (struct cmd_t_test *cmd UNUSED) static int -tts_custom_pairs (struct cmd_t_test *cmd UNUSED) +tts_custom_pairs (struct cmd_t_test *cmd UNUSED, void *aux UNUSED) { struct variable **vars; size_t n_vars; @@ -577,7 +583,7 @@ parse_value (union value * v, int type ) { if (!lex_force_string ()) return 0; - strncpy (v->s, ds_c_str (&tokstr), ds_length (&tokstr)); + strncpy (v->s, ds_cstr (&tokstr), ds_length (&tokstr)); } lex_get (); @@ -618,7 +624,7 @@ ssbox_create(struct ssbox *ssb, struct cmd_t_test *cmd, int mode) ssbox_paired_init(ssb,cmd); break; default: - assert(0); + NOT_REACHED (); } } @@ -677,7 +683,7 @@ ssbox_one_sample_init(struct ssbox *this, this->populate = ssbox_one_sample_populate; ssbox_base_init(this, hsize,vsize); - tab_title (this->t, 0, _("One-Sample Statistics")); + tab_title (this->t, _("One-Sample Statistics")); tab_vline(this->t, TAL_2, 1,0,vsize - 1); tab_text (this->t, 1, 0, TAB_CENTER | TAT_TITLE, _("N")); tab_text (this->t, 2, 0, TAB_CENTER | TAT_TITLE, _("Mean")); @@ -699,8 +705,8 @@ ssbox_independent_samples_init(struct ssbox *this, this->populate = ssbox_independent_samples_populate; ssbox_base_init(this, hsize,vsize); - tab_title (this->t, 0, _("Group Statistics")); - tab_vline(this->t,0,1,0,vsize - 1); + tab_vline (this->t, TAL_GAP, 1, 0,vsize - 1); + tab_title (this->t, _("Group Statistics")); tab_text (this->t, 1, 0, TAB_CENTER | TAT_TITLE, indep_var->name); tab_text (this->t, 2, 0, TAB_CENTER | TAT_TITLE, _("N")); tab_text (this->t, 3, 0, TAB_CENTER | TAT_TITLE, _("Mean")); @@ -823,8 +829,8 @@ ssbox_paired_init(struct ssbox *this, struct cmd_t_test *cmd UNUSED) this->populate = ssbox_paired_populate; ssbox_base_init(this, hsize,vsize); - tab_title (this->t, 0, _("Paired Sample Statistics")); - tab_vline(this->t,TAL_0,1,0,vsize-1); + tab_title (this->t, _("Paired Sample Statistics")); + tab_vline(this->t,TAL_GAP,1,0,vsize-1); tab_vline(this->t,TAL_2,2,0,vsize-1); tab_text (this->t, 2, 0, TAB_CENTER | TAT_TITLE, _("Mean")); tab_text (this->t, 3, 0, TAB_CENTER | TAT_TITLE, _("N")); @@ -932,7 +938,7 @@ trbox_create(struct trbox *trb, trbox_paired_init(trb,cmd); break; default: - assert(0); + NOT_REACHED (); } } @@ -962,7 +968,7 @@ trbox_independent_samples_init(struct trbox *self, self->populate = trbox_independent_samples_populate; trbox_base_init(self,cmd->n_variables*2,hsize); - tab_title(self->t,0,_("Independent Samples Test")); + tab_title(self->t,_("Independent Samples Test")); tab_hline(self->t,TAL_1,2,hsize-1,1); tab_vline(self->t,TAL_2,2,0,vsize-1); tab_vline(self->t,TAL_1,4,0,vsize-1); @@ -1150,14 +1156,14 @@ trbox_paired_init(struct trbox *self, self->populate = trbox_paired_populate; trbox_base_init(self,n_pairs,hsize); - tab_title (self->t, 0, _("Paired Samples Test")); + tab_title (self->t, _("Paired Samples Test")); tab_hline(self->t,TAL_1,2,6,1); tab_vline(self->t,TAL_2,2,0,vsize - 1); tab_joint_text(self->t,2,0,6,0,TAB_CENTER,_("Paired Differences")); tab_box(self->t,-1,-1,-1,TAL_1, 2,1,6,vsize-1); tab_box(self->t,-1,-1,-1,TAL_1, 6,0,hsize-1,vsize-1); tab_hline(self->t,TAL_1,5,6, 2); - tab_vline(self->t,TAL_0,6,0,1); + tab_vline(self->t,TAL_GAP,6,0,1); tab_joint_text(self->t, 5, 1, 6, 1, TAB_CENTER | TAT_PRINTF, _("%g%% Confidence Interval of the Difference"), @@ -1244,7 +1250,7 @@ trbox_one_sample_init(struct trbox *self, struct cmd_t_test *cmd ) self->populate = trbox_one_sample_populate; trbox_base_init(self, cmd->n_variables,hsize); - tab_title (self->t, 0, _("One-Sample Test")); + tab_title (self->t, _("One-Sample Test")); tab_hline(self->t, TAL_1, 1, hsize - 1, 1); tab_vline(self->t, TAL_2, 1, 0, vsize - 1); @@ -1258,7 +1264,7 @@ trbox_one_sample_init(struct trbox *self, struct cmd_t_test *cmd ) _("%g%% Confidence Interval of the Difference"), cmd->criteria*100.0); - tab_vline(self->t,TAL_0,6,1,1); + tab_vline(self->t,TAL_GAP,6,1,1); tab_hline(self->t,TAL_1,5,6,2); tab_text (self->t, 1, 2, TAB_CENTER | TAT_TITLE, _("t")); tab_text (self->t, 2, 2, TAB_CENTER | TAT_TITLE, _("df")); @@ -1359,7 +1365,7 @@ pscbox(void) tab_hline(table, TAL_2, 0, cols - 1, 1); tab_vline(table, TAL_2, 2, 0, rows - 1); tab_dim(table, tab_natural_dimensions); - tab_title(table, 0, _("Paired Samples Correlations")); + tab_title(table, _("Paired Samples Correlations")); /* column headings */ tab_text(table, 2,0, TAB_CENTER | TAT_TITLE, _("N")); @@ -1832,7 +1838,7 @@ group_postcalc ( struct cmd_t_test *cmd ) static bool -calculate(const struct casefile *cf, void *cmd_) +calculate(const struct ccase *first, const struct casefile *cf, void *cmd_) { struct ssbox stat_summary_box; struct trbox test_results_box; @@ -1842,6 +1848,7 @@ calculate(const struct casefile *cf, void *cmd_) struct cmd_t_test *cmd = (struct cmd_t_test *) cmd_; + output_split_file_values (first); common_precalc(cmd); for(r = casefile_get_reader (cf); casereader_read (r, &c) ; @@ -1964,7 +1971,7 @@ hash_group_binary(const struct group_statistics *g, flag = which_group(g,p); } else - assert(0); + NOT_REACHED (); return flag; }