#include <config.h>
#include <libpspp/compiler.h>
#include <output/table.h>
-#include <libpspp/alloc.h>
#include <data/case.h>
#include <data/casereader.h>
#include "binomial.h"
#include "freq.h"
+#include "xalloc.h"
+
#include "gettext.h"
#define _(msgid) gettext (msgid)
#include <gsl/gsl_cdf.h>
#include <gsl/gsl_randist.h>
-#include <gsl-extras/gsl-extras.h>
#include <minmax.h>
/* SPSS Statistical Algorithms has completely different and WRONG
advice here. */
- double sig1tailed = gslextras_cdf_binomial_P (n1, n1 + n2, p);
+ double sig1tailed = gsl_cdf_binomial_P (n1, p, n1 + n2);
if ( p == 0.5 )
return sig1tailed > 0.5 ? 1.0 :sig1tailed * 2.0;
cat1[v].value = value_dup (value, width);
cat1[v].count = w;
}
- else if ( 0 == compare_values (cat1[v].value, value, width))
+ else if ( 0 == compare_values (cat1[v].value, value, var))
cat1[v].count += w;
else if ( NULL == cat2[v].value )
{
cat2[v].value = value_dup (value, width);
cat2[v].count = w;
}
- else if ( 0 == compare_values (cat2[v].value, value, width))
+ else if ( 0 == compare_values (cat2[v].value, value, var))
cat2[v].count += w;
else if ( bst->category1 == SYSMIS)
msg (ME, _("Variable %s is not dichotomous"), var_get_name (var));
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 binomial_test *bst = (const struct binomial_test *) test;
for (v = 0 ; v < ost->n_vars; ++v)
{
double n_total, sig;
+ struct string catstr1;
+ struct string catstr2;
const struct variable *var = ost->vars[v];
+
+ ds_init_empty (&catstr1);
+ ds_init_empty (&catstr2);
+
+ var_append_value_name (var, cat1[v].value, &catstr1);
+ var_append_value_name (var, cat2[v].value, &catstr2);
+
tab_hline (table, TAL_1, 0, tab_nc (table) -1, 1 + v * 3);
/* Titles */
tab_float (table, 5, 1 + v * 3, TAB_NONE, bst->p, 8, 3);
/* Category labels */
- tab_text (table, 2, 1 + v * 3, TAB_NONE,
- var_get_value_name (var, cat1[v].value));
- tab_text (table, 2, 2 + v * 3, TAB_NONE,
- var_get_value_name (var, cat2[v].value));
+ tab_text (table, 2, 1 + v * 3, TAB_NONE, ds_cstr (&catstr1));
+ tab_text (table, 2, 2 + v * 3, TAB_NONE, ds_cstr (&catstr2));
/* Observed N */
tab_float (table, 3, 1 + v * 3, TAB_NONE, cat1[v].count, 8, 0);
/* Significance */
sig = calculate_binomial (cat1[v].count, cat2[v].count, bst->p);
tab_float (table, 6, 1 + v * 3, TAB_NONE, sig, 8, 3);
+
+ ds_destroy (&catstr1);
+ ds_destroy (&catstr2);
}
tab_text (table, 2, 0, TAB_CENTER, _("Category"));