From: John Darrington Date: Sat, 9 Oct 2010 10:46:45 +0000 (+0200) Subject: NPAR TESTS: reformat and use cast macros X-Git-Tag: v0.7.6~44 X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f5f0b6da1e66e087a45152ee74c3aeab60612cf7;p=pspp-builds.git NPAR TESTS: reformat and use cast macros --- diff --git a/src/language/stats/npar.c b/src/language/stats/npar.c index 8a507789..409369ed 100644 --- a/src/language/stats/npar.c +++ b/src/language/stats/npar.c @@ -68,27 +68,20 @@ enum /* NPAR TESTS structure. */ struct cmd_npar_tests { - /* CHISQUARE subcommand. */ + /* Count variables indicating how many + of the subcommands have been given. */ int chisquare; - - /* BINOMIAL subcommand. */ int binomial; - - /* WILCOXON subcommand. */ int wilcoxon; - - /* SIGN subcommand. */ int sign; - - /* MISSING subcommand. */ int missing; - long miss; - - /* METHOD subcommand. */ int method; - - /* STATISTICS subcommand. */ int statistics; + + /* How missing values should be treated */ + long miss; + + /* Which statistics have been requested */ int a_statistics[NPAR_ST_count]; }; @@ -726,6 +719,7 @@ parse_two_sample_related_test (struct lexer *lexer, return true; } + static int npar_wilcoxon (struct lexer *lexer, struct dataset *ds, @@ -772,25 +766,27 @@ npar_sign (struct lexer *lexer, struct dataset *ds, return 1; } + /* Insert the variables for TEST into VAR_HASH */ static void one_sample_insert_variables (const struct npar_test *test, struct const_hsh_table *var_hash) { int i; - struct one_sample_test *ost = UP_CAST (test, struct one_sample_test, parent); + const struct one_sample_test *ost = UP_CAST (test, const struct one_sample_test, parent); for ( i = 0 ; i < ost->n_vars ; ++i ) const_hsh_insert (var_hash, ost->vars[i]); } + static void two_sample_insert_variables (const struct npar_test *test, struct const_hsh_table *var_hash) { int i; - const struct two_sample_test *tst = (const struct two_sample_test *) test; + const struct two_sample_test *tst = UP_CAST (test, const struct two_sample_test, parent); for ( i = 0 ; i < tst->n_pairs ; ++i ) {