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

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

diff --git a/src/language/stats/cochran.c b/src/language/stats/cochran.c
index 3b6af22d6d512bc14fd6285fb9ac08ce878f643c..4274a583dee164bb32a393e00f2caf236f807736 100644 (file)
--- a/src/language/stats/cochran.c
+++ b/src/language/stats/cochran.c
@@ -1,5 +1,5 @@
 /* PSPP - a program for statistical analysis.
-   Copyright (C) 2010 Free Software Foundation, Inc.
+   Copyright (C) 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
@@ -16,27 +16,27 @@
 
 #include <config.h>
 
-#include "cochran.h"
-#include "npar.h"
-#include <stdbool.h>
-#include <libpspp/cast.h>
-#include <libpspp/message.h>
-#include <libpspp/misc.h>
-
-#include <data/procedure.h>
-#include <data/dictionary.h>
-#include <data/variable.h>
-#include <data/val-type.h>
-#include <data/casereader.h>
+#include "language/stats/cochran.h"
 
+#include <float.h>
 #include <gsl/gsl_cdf.h>
+#include <stdbool.h>
+
+#include "data/casereader.h"
+#include "data/dataset.h"
+#include "data/dictionary.h"
+#include "data/format.h"
+#include "data/val-type.h"
+#include "data/variable.h"
+#include "language/stats/npar.h"
+#include "libpspp/cast.h"
+#include "libpspp/message.h"
+#include "libpspp/misc.h"
+#include "output/tab.h"
 
-#include <data/format.h>
-#include <output/tab.h>
 #include "gettext.h"
 #define _(msgid) gettext (msgid)
 
-
 struct cochran
 {
   double success;
@@ -154,6 +154,7 @@ show_freqs_box (const struct one_sample_test *ost, const struct cochran *ct)
   const int column_headers = 2;
   struct tab_table *table =
     tab_create (row_headers + 2, column_headers + ost->n_vars);
+  tab_set_format (table, RC_WEIGHT, wfmt);
 
   tab_headers (table, row_headers, 0, column_headers, 0);
 
@@ -170,8 +171,10 @@ show_freqs_box (const struct one_sample_test *ost, const struct cochran *ct)
   tab_joint_text (table, 1, 0, 2, 0,
                  TAT_TITLE | TAB_CENTER, _("Value"));
 
-  tab_text_format (table, 1, 1, 0, _("Success (%g)"), ct->success);
-  tab_text_format (table, 2, 1, 0, _("Failure (%g)"), ct->failure);
+  tab_text_format (table, 1, 1, 0, _("Success (%.*g)"),
+                   DBL_DIG + 1, ct->success);
+  tab_text_format (table, 2, 1, 0, _("Failure (%.*g)"),
+                   DBL_DIG + 1, ct->failure);
 
   tab_hline (table, TAL_2, 0, tab_nc (table) - 1, column_headers);
   tab_vline (table, TAL_2, row_headers, 0, tab_nr (table) - 1);
@@ -182,10 +185,10 @@ show_freqs_box (const struct one_sample_test *ost, const struct cochran *ct)
                TAB_LEFT, var_to_string (ost->vars[i]));
 
       tab_double (table, 1, column_headers + i, 0,
-                 ct->hits[i], wfmt);
+                 ct->hits[i], NULL, RC_WEIGHT);
 
       tab_double (table, 2, column_headers + i, 0,
-                 ct->misses[i], wfmt);
+                 ct->misses[i], NULL, RC_WEIGHT);
     }
 
   tab_submit (table);
@@ -204,6 +207,9 @@ show_sig_box (const struct cochran *ch)
   struct tab_table *table =
     tab_create (row_headers + 1, column_headers + 4);
 
+
+  tab_set_format (table, RC_WEIGHT, wfmt);
+
   tab_headers (table, row_headers, 0, column_headers, 0);
 
   tab_title (table, _("Test Statistics"));
@@ -228,17 +234,17 @@ show_sig_box (const struct cochran *ch)
   tab_vline (table, TAL_2, row_headers, 0, tab_nr (table) - 1);
 
   tab_double (table, 1, column_headers, 
-             0, ch->cc, wfmt);
+             0, ch->cc, NULL, RC_WEIGHT);
 
   tab_double (table, 1, column_headers + 1, 
-             0, ch->q, 0);
+             0, ch->q, NULL, RC_OTHER);
 
   tab_double (table, 1, column_headers + 2, 
-             0, ch->df, &F_8_0);
+             0, ch->df, NULL, RC_INTEGER);
 
   tab_double (table, 1, column_headers + 3, 
              0, gsl_cdf_chisq_Q (ch->q, ch->df), 
-             0);
+             NULL, RC_PVALUE);
 
   tab_submit (table);
 }