/* PSPP - a program for statistical analysis.
- Copyright (C) 2006 Free Software Foundation, Inc.
+ Copyright (C) 2006, 2009 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
#include <libpspp/compiler.h>
#include <output/table.h>
+#include <data/format.h>
#include <data/case.h>
#include <data/casereader.h>
#include <data/dictionary.h>
bool warn = true;
const struct one_sample_test *ost = (const struct one_sample_test *) bst;
- struct ccase c;
+ struct ccase *c;
- while (casereader_read(input, &c))
+ for (; (c = casereader_read (input)) != NULL; case_unref (c))
{
int v;
- double w = dict_get_case_weight (dict, &c, &warn);
+ double w = dict_get_case_weight (dict, c, &warn);
for (v = 0 ; v < ost->n_vars ; ++v )
{
const struct variable *var = ost->vars[v];
- const union value *value = case_data (&c, var);
- int width = var_get_width (var);
+ double value = case_num (c, var);
- if (var_is_value_missing (var, value, exclude))
- break;
+ if (var_is_num_missing (var, value, exclude))
+ continue;
- if ( NULL == cat1[v].value )
+ if (bst->cutpoint != SYSMIS)
{
- cat1[v].value = value_dup (value, width);
- cat1[v].count = w;
+ if ( cat1[v].value.f >= value )
+ cat1[v].count += w;
+ else
+ cat2[v].count += w;
}
- else if ( 0 == compare_values (cat1[v].value, value, width))
- cat1[v].count += w;
- else if ( NULL == cat2[v].value )
+ else
{
- cat2[v].value = value_dup (value, width);
- cat2[v].count = w;
+ if ( SYSMIS == cat1[v].value.f )
+ {
+ cat1[v].value.f = value;
+ cat1[v].count = w;
+ }
+ else if ( cat1[v].value.f == value )
+ cat1[v].count += w;
+ else if ( SYSMIS == cat2[v].value.f )
+ {
+ cat2[v].value.f = value;
+ cat2[v].count = w;
+ }
+ else if ( cat2[v].value.f == value )
+ cat2[v].count += w;
+ else if ( bst->category1 == SYSMIS)
+ msg (ME, _("Variable %s is not dichotomous"), var_get_name (var));
}
- else if ( 0 == compare_values (cat2[v].value, value, width))
- cat2[v].count += w;
- else if ( bst->category1 == SYSMIS)
- msg (ME, _("Variable %s is not dichotomous"), var_get_name (var));
}
-
- case_destroy (&c);
}
return casereader_destroy (input);
}
binomial_execute (const struct dataset *ds,
struct casereader *input,
enum mv_class exclude,
- const struct npar_test *test)
+ const struct npar_test *test,
+ bool exact UNUSED,
+ double timer UNUSED)
{
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;
- struct freq_mutable *cat1 = xzalloc (sizeof (*cat1) * ost->n_vars);
- struct freq_mutable *cat2 = xzalloc (sizeof (*cat1) * ost->n_vars);
+ struct freq_mutable *cat[2];
+ int i;
- assert ((bst->category1 == SYSMIS) == (bst->category2 == SYSMIS) );
+ assert ((bst->category1 == SYSMIS) == (bst->category2 == SYSMIS) || bst->cutpoint != SYSMIS);
- if ( bst->category1 != SYSMIS )
+ for (i = 0; i < 2; i++)
{
- union value v;
- v.f = bst->category1;
- cat1->value = value_dup (&v, 0);
+ double value;
+ if (i == 0)
+ value = bst->cutpoint != SYSMIS ? bst->cutpoint : bst->category1;
+ else
+ value = bst->category2;
+
+ 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].count = 0;
+ }
}
- if ( bst->category2 != SYSMIS )
+ if (do_binomial (dataset_dict (ds), input, bst, cat[0], cat[1], exclude))
{
- union value v;
- v.f = bst->category2;
- cat2->value = value_dup (&v, 0);
- }
+ const struct variable *wvar = dict_get_weight (dict);
+ const struct fmt_spec *wfmt = wvar ?
+ var_get_print_format (wvar) : & F_8_0;
- if (do_binomial (dataset_dict(ds), input, bst, cat1, cat2, exclude))
- {
struct tab_table *table = tab_create (7, ost->n_vars * 3 + 1, 0);
- tab_dim (table, tab_natural_dimensions);
+ tab_dim (table, tab_natural_dimensions, NULL);
tab_title (table, _("Binomial Test"));
for (v = 0 ; v < ost->n_vars; ++v)
{
double n_total, sig;
- struct string catstr1;
- struct string catstr2;
+ struct string catstr[2];
const struct variable *var = ost->vars[v];
- ds_init_empty (&catstr1);
- ds_init_empty (&catstr2);
+ ds_init_empty (&catstr[0]);
+ ds_init_empty (&catstr[1]);
- var_append_value_name (var, cat1[v].value, &catstr1);
- var_append_value_name (var, cat2[v].value, &catstr2);
+ if ( bst->cutpoint != SYSMIS)
+ {
+ ds_put_format (&catstr[0], "<= %g", 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]);
+ }
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_float (table, 5, 1 + v * 3, TAB_NONE, bst->p, 8, 3);
+ tab_double (table, 5, 1 + v * 3, TAB_NONE, bst->p, NULL);
/* Category labels */
- tab_text (table, 2, 1 + v * 3, TAB_NONE, ds_cstr (&catstr1));
- tab_text (table, 2, 2 + v * 3, TAB_NONE, ds_cstr (&catstr2));
+ 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_float (table, 3, 1 + v * 3, TAB_NONE, cat1[v].count, 8, 0);
- tab_float (table, 3, 2 + v * 3, TAB_NONE, cat2[v].count, 8, 0);
+ 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);
- n_total = cat1[v].count + cat2[v].count;
- tab_float (table, 3, 3 + v * 3, TAB_NONE, n_total, 8, 0);
+ n_total = cat[0][v].count + cat[1][v].count;
+ tab_double (table, 3, 3 + v * 3, TAB_NONE, n_total, wfmt);
/* Observed Proportions */
- tab_float (table, 4, 1 + v * 3, TAB_NONE,
- cat1[v].count / n_total, 8, 3);
- tab_float (table, 4, 2 + v * 3, TAB_NONE,
- cat2[v].count / n_total, 8, 3);
- tab_float (table, 4, 3 + v * 3, TAB_NONE,
- (cat1[v].count + cat2[v].count) / n_total, 8, 2);
+ tab_double (table, 4, 1 + v * 3, TAB_NONE,
+ cat[0][v].count / n_total, NULL);
+ tab_double (table, 4, 2 + v * 3, TAB_NONE,
+ cat[1][v].count / n_total, NULL);
+
+ tab_double (table, 4, 3 + v * 3, TAB_NONE,
+ (cat[0][v].count + cat[1][v].count) / n_total, NULL);
/* Significance */
- sig = calculate_binomial (cat1[v].count, cat2[v].count, bst->p);
- tab_float (table, 6, 1 + v * 3, TAB_NONE, sig, 8, 3);
+ sig = calculate_binomial (cat[0][v].count, cat[1][v].count, bst->p);
+ tab_double (table, 6, 1 + v * 3, TAB_NONE, sig, NULL);
- ds_destroy (&catstr1);
- ds_destroy (&catstr2);
+ ds_destroy (&catstr[0]);
+ ds_destroy (&catstr[1]);
}
tab_text (table, 2, 0, TAB_CENTER, _("Category"));
tab_text (table, 4, 0, TAB_CENTER, _("Observed Prop."));
tab_text (table, 5, 0, TAB_CENTER, _("Test Prop."));
- tab_text (table, 6, 0, TAB_CENTER | TAT_PRINTF,
- _("Exact Sig. (%d-tailed)"),
- bst->p == 0.5 ? 2: 1);
+ tab_text_format (table, 6, 0, TAB_CENTER,
+ _("Exact Sig. (%d-tailed)"),
+ bst->p == 0.5 ? 2 : 1);
tab_vline (table, TAL_2, 2, 0, tab_nr (table) -1);
tab_submit (table);
}
- for (v = 0; v < ost->n_vars; v++)
- {
- free (cat1[v].value);
- free (cat2[v].value);
- }
- free (cat1);
- free (cat2);
+ for (i = 0; i < 2; i++)
+ free (cat[i]);
}
projects / pspp-builds.git / blobdiff