X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Flanguage%2Fstats%2Fbinomial.c;h=c83e4570a0dab3a1a19cd58285553c2a152acaf3;hb=81579d9e9f994fb2908f50af41c3eb033d216e58;hp=26e0257ca14030ca3d58a2ae10acd8f960b45d2c;hpb=b5c82cc9aabe7e641011130240ae1b2e84348e23;p=pspp-builds.git diff --git a/src/language/stats/binomial.c b/src/language/stats/binomial.c index 26e0257c..c83e4570 100644 --- a/src/language/stats/binomial.c +++ b/src/language/stats/binomial.c @@ -1,5 +1,5 @@ /* PSPP - a program for statistical analysis. - Copyright (C) 2006, 2009 Free Software Foundation, Inc. + Copyright (C) 2006, 2009, 2010, 2011 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -15,37 +15,32 @@ along with this program. If not, see . */ #include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include -#include - -#include "binomial.h" -#include "freq.h" - -#include "xalloc.h" - -#include "gettext.h" -#define _(msgid) gettext (msgid) - -#include +#include "language/stats/binomial.h" #include #include -#include +#include "data/case.h" +#include "data/casereader.h" +#include "data/dictionary.h" +#include "data/format.h" +#include "data/procedure.h" +#include "data/value-labels.h" +#include "data/value.h" +#include "data/variable.h" +#include "language/stats/freq.h" +#include "libpspp/assertion.h" +#include "libpspp/compiler.h" +#include "libpspp/message.h" +#include "libpspp/misc.h" +#include "output/tab.h" + +#include "gl/xalloc.h" +#include "gl/minmax.h" -#include +#include "gettext.h" +#define _(msgid) gettext (msgid) static double calculate_binomial_internal (double n1, double n2, double p); @@ -90,15 +85,15 @@ calculate_binomial_internal (double n1, double n2, double p) static bool do_binomial (const struct dictionary *dict, struct casereader *input, - const struct binomial_test *bst, - struct freq_mutable *cat1, - struct freq_mutable *cat2, + const struct one_sample_test *ost, + struct freq *cat1, + struct freq *cat2, enum mv_class exclude ) { + const struct binomial_test *bst = UP_CAST (ost, const struct binomial_test, parent); bool warn = true; - const struct one_sample_test *ost = (const struct one_sample_test *) bst; struct ccase *c; for (; (c = casereader_read (input)) != NULL; case_unref (c)) @@ -157,10 +152,10 @@ binomial_execute (const struct dataset *ds, { int v; const struct dictionary *dict = dataset_dict (ds); - const struct binomial_test *bst = (const struct binomial_test *) test; - const struct one_sample_test *ost = (const struct one_sample_test*) test; + const struct one_sample_test *ost = UP_CAST (test, const struct one_sample_test, parent); + const struct binomial_test *bst = UP_CAST (ost, const struct binomial_test, parent); - struct freq_mutable *cat[2]; + struct freq *cat[2]; int i; assert ((bst->category1 == SYSMIS) == (bst->category2 == SYSMIS) || bst->cutpoint != SYSMIS); @@ -181,22 +176,20 @@ binomial_execute (const struct dataset *ds, } } - if (do_binomial (dataset_dict (ds), input, bst, cat[0], cat[1], exclude)) + if (do_binomial (dataset_dict (ds), input, ost, cat[0], cat[1], exclude)) { const struct variable *wvar = dict_get_weight (dict); const struct fmt_spec *wfmt = wvar ? var_get_print_format (wvar) : & F_8_0; - struct tab_table *table = tab_create (7, ost->n_vars * 3 + 1, 0); - - tab_dim (table, tab_natural_dimensions, NULL); + struct tab_table *table = tab_create (7, ost->n_vars * 3 + 1); tab_title (table, _("Binomial Test")); tab_headers (table, 2, 0, 1, 0); tab_box (table, TAL_1, TAL_1, -1, TAL_1, - 0, 0, table->nc - 1, tab_nr(table) - 1 ); + 0, 0, tab_nc (table) - 1, tab_nr(table) - 1 ); for (v = 0 ; v < ost->n_vars; ++v) {