FREQUENCIES: Use newer hmap library instead of older hsh_table library.

[pspp] / src / language / stats / binomial.c

diff --git a/src/language/stats/binomial.c b/src/language/stats/binomial.c
index 67e378bbc81451d84c34641d76c4fbb930f2bb69..b92018fdb400e9fe88d72ec93eed6d04d40d9bbe 100644 (file)
--- 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 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
@@ -16,7 +16,7 @@
 
 #include <config.h>
 #include <libpspp/compiler.h>
-#include <output/table.h>
+#include <output/tab.h>
 
 #include <data/format.h>
 #include <data/case.h>
@@ -91,8 +91,8 @@ static bool
 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
             )
 {
@@ -160,7 +160,7 @@ binomial_execute (const struct dataset *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 *cat[2];
+  struct freq *cat[2];
   int i;
 
   assert ((bst->category1 == SYSMIS) == (bst->category2 == SYSMIS) || bst->cutpoint != SYSMIS);
@@ -187,9 +187,7 @@ binomial_execute (const struct dataset *ds,
       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, NULL);
+      struct tab_table *table = tab_create (7, ost->n_vars * 3 + 1);
 
       tab_title (table, _("Binomial Test"));
 
@@ -261,9 +259,9 @@ binomial_execute (const struct dataset *ds,
       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);