/* PSPP - a program for statistical analysis.
- Copyright (C) 2006, 2009 Free Software Foundation, Inc.
+ Copyright (C) 2006, 2009, 2010 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 <config.h>
#include <libpspp/compiler.h>
-#include <output/table.h>
+#include <output/tab.h>
#include <data/format.h>
#include <data/case.h>
#include <minmax.h>
-#include <libpspp/hash.h>
-
static double calculate_binomial_internal (double n1, double n2,
double p);
do_binomial (const struct dictionary *dict,
struct casereader *input,
const struct binomial_test *bst,
- struct freq_mutable *cat1,
- struct freq_mutable *cat2,
+ struct freq *cat1,
+ struct freq *cat2,
enum mv_class exclude
)
{
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 *cat[2];
+ struct freq *cat[2];
int i;
assert ((bst->category1 == SYSMIS) == (bst->category2 == SYSMIS) || bst->cutpoint != SYSMIS);
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)
{