Added result_class parameter to tab_double and updated all callers. Removed tab_fixed

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

diff --git a/src/language/stats/binomial.c b/src/language/stats/binomial.c
index 8126daf36c725d80652a6add4db7098c35dcdd72..697f3254ab1f14354986bcc50a5b591b4f65cf3c 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, 2010 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
@@ -15,36 +15,34 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
 
 #include <config.h>
-#include <libpspp/compiler.h>
-#include <output/tab.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 "language/stats/binomial.h"
 
-#include <libpspp/message.h>
-#include <libpspp/assertion.h>
-
-#include "binomial.h"
-#include "freq.h"
+#include <float.h>
+#include <gsl/gsl_cdf.h>
+#include <gsl/gsl_randist.h>
 
-#include "xalloc.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 "gettext.h"
 #define _(msgid) gettext (msgid)
 
-#include <libpspp/misc.h>
-
-#include <gsl/gsl_cdf.h>
-#include <gsl/gsl_randist.h>
-
-#include <minmax.h>
-
 static double calculate_binomial_internal (double n1, double n2,
                                           double p);
 
@@ -186,6 +184,7 @@ binomial_execute (const struct dataset *ds,
        var_get_print_format (wvar) : & F_8_0;
 
       struct tab_table *table = tab_create (7, ost->n_vars * 3 + 1);
+      tab_set_format (table, RC_WEIGHT, wfmt);
 
       tab_title (table, _("Binomial Test"));
 
@@ -205,7 +204,8 @@ binomial_execute (const struct dataset *ds,
 
          if ( bst->cutpoint != SYSMIS)
            {
-             ds_put_format (&catstr[0], "<= %g", bst->cutpoint);
+             ds_put_format (&catstr[0], "<= %.*g",
+                             DBL_DIG + 1, bst->cutpoint);
            }
           else
             {
@@ -222,31 +222,31 @@ binomial_execute (const struct dataset *ds,
           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]);