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

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

diff --git a/src/language/stats/sign.c b/src/language/stats/sign.c
index 754b0d7dfcd6b47c08d62f6f4db05ab8a6e90812..5149489d1185fd6633fe7eb2b27c1255f40ef872 100644 (file)
--- a/src/language/stats/sign.c
+++ b/src/language/stats/sign.c
@@ -1,5 +1,5 @@
 /* PSPP - a program for statistical analysis.
-   Copyright (C) 2009 Free Software Foundation, Inc.
+   Copyright (C) 2009, 2010, 2011 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,22 +15,24 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
 
 #include <config.h>
-#include "sign.h"
 
-#include <data/variable.h>
-#include <libpspp/str.h>
-#include <output/tab.h>
+#include "language/stats/sign.h"
+
 #include <gsl/gsl_cdf.h>
 #include <gsl/gsl_randist.h>
-#include "npar.h"
-#include <data/procedure.h>
-#include <data/missing-values.h>
-#include <data/dictionary.h>
-#include <data/casereader.h>
-#include <data/format.h>
 
-#include "minmax.h"
-#include "xalloc.h"
+#include "data/casereader.h"
+#include "data/dataset.h"
+#include "data/dictionary.h"
+#include "data/format.h"
+#include "data/missing-values.h"
+#include "data/variable.h"
+#include "language/stats/npar.h"
+#include "libpspp/str.h"
+#include "output/tab.h"
+
+#include "gl/minmax.h"
+#include "gl/xalloc.h"
 
 #include "gettext.h"
 #define _(msgid) gettext (msgid)
@@ -57,6 +59,7 @@ output_frequency_table (const struct two_sample_test *t2s,
   const struct variable *wv = dict_get_weight (dict);
   const struct fmt_spec *wfmt = wv ? var_get_print_format (wv) : & F_8_0;
 
+  tab_set_format (table, RC_WEIGHT, wfmt);
   tab_title (table, _("Frequencies"));
 
   tab_headers (table, 2, 0, 1, 0);
@@ -80,6 +83,7 @@ output_frequency_table (const struct two_sample_test *t2s,
       ds_put_cstr (&pair_name, " - ");
       ds_put_cstr (&pair_name, var_to_string ((*vp)[1]));
 
+
       tab_text (table, 0, 1 + i * 4, TAB_LEFT, ds_cstr (&pair_name));
 
       ds_destroy (&pair_name);
@@ -91,11 +95,11 @@ output_frequency_table (const struct two_sample_test *t2s,
       tab_text (table,  1, 3 + i * 4,  TAB_LEFT, _("Ties"));
       tab_text (table,  1, 4 + i * 4,  TAB_LEFT, _("Total"));
 
-      tab_double (table, 2, 1 + i * 4, TAB_RIGHT, param[i].neg, wfmt);
-      tab_double (table, 2, 2 + i * 4, TAB_RIGHT, param[i].pos, wfmt);
-      tab_double (table, 2, 3 + i * 4, TAB_RIGHT, param[i].ties, wfmt);
+      tab_double (table, 2, 1 + i * 4, TAB_RIGHT, param[i].neg, NULL, RC_WEIGHT);
+      tab_double (table, 2, 2 + i * 4, TAB_RIGHT, param[i].pos, NULL, RC_WEIGHT);
+      tab_double (table, 2, 3 + i * 4, TAB_RIGHT, param[i].ties, NULL, RC_WEIGHT);
       tab_double (table, 2, 4 + i * 4, TAB_RIGHT,
-                param[i].ties + param[i].neg + param[i].pos, wfmt);
+                 param[i].ties + param[i].neg + param[i].pos, NULL, RC_WEIGHT);
     }
 
   tab_submit (table);
@@ -148,10 +152,10 @@ output_statistics_table (const struct two_sample_test *t2s,
       ds_destroy (&pair_name);
 
       tab_double (table, 1 + i, 1, TAB_RIGHT,
-                 param[i].one_tailed_sig * 2, NULL);
+                 param[i].one_tailed_sig * 2, NULL, RC_PVALUE);
 
-      tab_double (table, 1 + i, 2, TAB_RIGHT, param[i].one_tailed_sig, NULL);
-      tab_double (table, 1 + i, 3, TAB_RIGHT, param[i].point_prob, NULL);
+      tab_double (table, 1 + i, 2, TAB_RIGHT, param[i].one_tailed_sig, NULL, RC_PVALUE);
+      tab_double (table, 1 + i, 3, TAB_RIGHT, param[i].point_prob, NULL, RC_PVALUE);
     }
 
   tab_submit (table);
@@ -168,10 +172,10 @@ sign_execute (const struct dataset *ds,
   int i;
   bool warn = true;
   const struct dictionary *dict = dataset_dict (ds);
-  const struct two_sample_test *t2s = (const struct two_sample_test *) test;
+  const struct two_sample_test *t2s = UP_CAST (test, const struct two_sample_test, parent);
   struct ccase *c;
 
-  struct sign_test_params *stp = xcalloc (sizeof *stp, t2s->n_pairs);
+  struct sign_test_params *stp = xcalloc (t2s->n_pairs, sizeof *stp);
 
   struct casereader *r = input;