/* PSPP - a program for statistical analysis.
- Copyright (C) 2006, 2009 Free Software Foundation, Inc.
+ Copyright (C) 2006, 2009, 2010, 2011, 2014 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
along with this program. If not, see <http://www.gnu.org/licenses/>. */
#include <config.h>
-#include <libpspp/compiler.h>
-#include <output/table.h>
-#include <data/format.h>
-#include <data/case.h>
-#include <data/casereader.h>
-#include <data/dictionary.h>
-#include <data/procedure.h>
-#include <data/variable.h>
-#include <data/value.h>
-#include <data/value-labels.h>
-
-#include <libpspp/message.h>
-#include <libpspp/assertion.h>
-
-#include "binomial.h"
-#include "freq.h"
-
-#include "xalloc.h"
-
-#include "gettext.h"
-#define _(msgid) gettext (msgid)
-
-#include <libpspp/misc.h>
+#include "language/stats/binomial.h"
+#include <float.h>
#include <gsl/gsl_cdf.h>
#include <gsl/gsl_randist.h>
-#include <minmax.h>
+#include "data/case.h"
+#include "data/casereader.h"
+#include "data/dataset.h"
+#include "data/dictionary.h"
+#include "data/format.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 <libpspp/hash.h>
+#include "gettext.h"
+#define _(msgid) gettext (msgid)
static double 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))
if (bst->cutpoint != SYSMIS)
{
- if ( cat1[v].value.f >= value )
+ if ( cat1[v].values[0].f >= value )
cat1[v].count += w;
else
cat2[v].count += w;
}
else
{
- if ( SYSMIS == cat1[v].value.f )
+ if ( SYSMIS == cat1[v].values[0].f )
{
- cat1[v].value.f = value;
+ cat1[v].values[0].f = value;
cat1[v].count = w;
}
- else if ( cat1[v].value.f == value )
+ else if ( cat1[v].values[0].f == value )
cat1[v].count += w;
- else if ( SYSMIS == cat2[v].value.f )
+ else if ( SYSMIS == cat2[v].values[0].f )
{
- cat2[v].value.f = value;
+ cat2[v].values[0].f = value;
cat2[v].count = w;
}
- else if ( cat2[v].value.f == value )
+ else if ( cat2[v].values[0].f == value )
cat2[v].count += w;
else if ( bst->category1 == SYSMIS)
msg (ME, _("Variable %s is not dichotomous"), var_get_name (var));
{
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);
cat[i] = xnmalloc (ost->n_vars, sizeof *cat[i]);
for (v = 0; v < ost->n_vars; v++)
{
- cat[i][v].value.f = value;
+ cat[i][v].values[0].f = value;
cat[i][v].count = 0;
}
}
- 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);
-
- tab_dim (table, tab_natural_dimensions, NULL, NULL);
+ tab_set_format (table, RC_WEIGHT, wfmt);
tab_title (table, _("Binomial Test"));
if ( bst->cutpoint != SYSMIS)
{
- ds_put_format (&catstr[0], "<= %g", bst->cutpoint);
+ ds_put_format (&catstr[0], "<= %.*g",
+ DBL_DIG + 1, bst->cutpoint);
}
else
{
- var_append_value_name (var, &cat[0][v].value, &catstr[0]);
- var_append_value_name (var, &cat[1][v].value, &catstr[1]);
+ var_append_value_name (var, cat[0][v].values, &catstr[0]);
+ var_append_value_name (var, cat[1][v].values, &catstr[1]);
}
tab_hline (table, TAL_1, 0, tab_nc (table) -1, 1 + v * 3);
tab_text (table, 1, 3 + v * 3, TAB_LEFT, _("Total"));
/* Test Prop */
- tab_double (table, 5, 1 + v * 3, TAB_NONE, bst->p, NULL);
+ tab_double (table, 5, 1 + v * 3, TAB_NONE, bst->p, NULL, RC_OTHER);
/* Category labels */
tab_text (table, 2, 1 + v * 3, TAB_NONE, ds_cstr (&catstr[0]));
tab_text (table, 2, 2 + v * 3, TAB_NONE, ds_cstr (&catstr[1]));
/* Observed N */
- tab_double (table, 3, 1 + v * 3, TAB_NONE, cat[0][v].count, wfmt);
- tab_double (table, 3, 2 + v * 3, TAB_NONE, cat[1][v].count, wfmt);
+ tab_double (table, 3, 1 + v * 3, TAB_NONE, cat[0][v].count, NULL, RC_WEIGHT);
+ tab_double (table, 3, 2 + v * 3, TAB_NONE, cat[1][v].count, NULL, RC_WEIGHT);
n_total = cat[0][v].count + cat[1][v].count;
- tab_double (table, 3, 3 + v * 3, TAB_NONE, n_total, wfmt);
+ tab_double (table, 3, 3 + v * 3, TAB_NONE, n_total, NULL, RC_WEIGHT);
/* Observed Proportions */
tab_double (table, 4, 1 + v * 3, TAB_NONE,
- cat[0][v].count / n_total, NULL);
+ cat[0][v].count / n_total, NULL, RC_OTHER);
tab_double (table, 4, 2 + v * 3, TAB_NONE,
- cat[1][v].count / n_total, NULL);
+ cat[1][v].count / n_total, NULL, RC_OTHER);
tab_double (table, 4, 3 + v * 3, TAB_NONE,
- (cat[0][v].count + cat[1][v].count) / n_total, NULL);
+ (cat[0][v].count + cat[1][v].count) / n_total, NULL, RC_OTHER);
/* Significance */
sig = calculate_binomial (cat[0][v].count, cat[1][v].count, bst->p);
- tab_double (table, 6, 1 + v * 3, TAB_NONE, sig, NULL);
+ tab_double (table, 6, 1 + v * 3, TAB_NONE, sig, NULL, RC_PVALUE);
ds_destroy (&catstr[0]);
ds_destroy (&catstr[1]);
projects / pspp / blobdiff