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

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

diff --git a/src/language/stats/wilcoxon.c b/src/language/stats/wilcoxon.c
index 268296d7e6ee404f2a6657d7970ec385628ff05e..2a8061dd91e0e17328e6ce45e0b25ffe5452b8d0 100644 (file)
--- a/src/language/stats/wilcoxon.c
+++ b/src/language/stats/wilcoxon.c
@@ -1,5 +1,5 @@
 /* Pspp - a program for statistical analysis.
-   Copyright (C) 2008, 2009, 2010 Free Software Foundation, Inc.
+   Copyright (C) 2008, 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
@@ -18,27 +18,27 @@
 
 #include <config.h>
 
-#include "wilcoxon.h"
+#include "language/stats/wilcoxon.h"
 
 #include <gsl/gsl_cdf.h>
 #include <math.h>
 
-#include <data/casereader.h>
-#include <data/casewriter.h>
-#include <data/dictionary.h>
-#include <data/format.h>
-#include <data/procedure.h>
-#include <data/subcase.h>
-#include <data/variable.h>
-#include <libpspp/assertion.h>
-#include <libpspp/message.h>
-#include <libpspp/misc.h>
-#include <math/sort.h>
-#include <math/wilcoxon-sig.h>
-#include <output/tab.h>
-
-#include "minmax.h"
-#include "xalloc.h"
+#include "data/casereader.h"
+#include "data/casewriter.h"
+#include "data/dataset.h"
+#include "data/dictionary.h"
+#include "data/format.h"
+#include "data/subcase.h"
+#include "data/variable.h"
+#include "libpspp/assertion.h"
+#include "libpspp/message.h"
+#include "libpspp/misc.h"
+#include "math/sort.h"
+#include "math/wilcoxon-sig.h"
+#include "output/tab.h"
+
+#include "gl/minmax.h"
+#include "gl/xalloc.h"
 
 static double
 append_difference (const struct ccase *c, casenumber n UNUSED, void *aux)
@@ -81,7 +81,7 @@ wilcoxon_execute (const struct dataset *ds,
   const struct dictionary *dict = dataset_dict (ds);
   const struct two_sample_test *t2s = UP_CAST (test, const struct two_sample_test, parent);
 
-  struct wilcoxon_state *ws = xcalloc (sizeof (*ws), t2s->n_pairs);
+  struct wilcoxon_state *ws = xcalloc (t2s->n_pairs, sizeof *ws);
   const struct variable *weight = dict_get_weight (dict);
   struct variable *weightx = dict_create_internal_var (WEIGHT_IDX, 0);
   struct caseproto *proto;
@@ -221,6 +221,7 @@ show_ranks_box (const struct wilcoxon_state *ws,
   const struct fmt_spec *wfmt = wv ? var_get_print_format (wv) : & F_8_0;
 
   struct tab_table *table = tab_create (5, 1 + 4 * t2s->n_pairs);
+  tab_set_format (table, RC_WEIGHT, wfmt);
 
   tab_title (table, _("Ranks"));
 
@@ -262,24 +263,24 @@ show_ranks_box (const struct wilcoxon_state *ws,
 
 
       /* N */
-      tab_double (table, 2, 1 + i * 4, TAB_RIGHT, ws[i].negatives.n, wfmt);
-      tab_double (table, 2, 2 + i * 4, TAB_RIGHT, ws[i].positives.n, wfmt);
-      tab_double (table, 2, 3 + i * 4, TAB_RIGHT, ws[i].n_zeros, wfmt);
+      tab_double (table, 2, 1 + i * 4, TAB_RIGHT, ws[i].negatives.n, NULL, RC_WEIGHT);
+      tab_double (table, 2, 2 + i * 4, TAB_RIGHT, ws[i].positives.n, NULL, RC_WEIGHT);
+      tab_double (table, 2, 3 + i * 4, TAB_RIGHT, ws[i].n_zeros, NULL, RC_WEIGHT);
 
       tab_double (table, 2, 4 + i * 4, TAB_RIGHT,
-                ws[i].n_zeros + ws[i].positives.n + ws[i].negatives.n, wfmt);
+                 ws[i].n_zeros + ws[i].positives.n + ws[i].negatives.n, NULL, RC_WEIGHT);
 
       /* Sums */
-      tab_double (table, 4, 1 + i * 4, TAB_RIGHT, ws[i].negatives.sum, NULL);
-      tab_double (table, 4, 2 + i * 4, TAB_RIGHT, ws[i].positives.sum, NULL);
+      tab_double (table, 4, 1 + i * 4, TAB_RIGHT, ws[i].negatives.sum, NULL, RC_OTHER);
+      tab_double (table, 4, 2 + i * 4, TAB_RIGHT, ws[i].positives.sum, NULL, RC_OTHER);
 
 
       /* Means */
       tab_double (table, 3, 1 + i * 4, TAB_RIGHT,
-                ws[i].negatives.sum / (double) ws[i].negatives.n, NULL);
+                 ws[i].negatives.sum / (double) ws[i].negatives.n, NULL, RC_OTHER);
 
       tab_double (table, 3, 2 + i * 4, TAB_RIGHT,
-                ws[i].positives.sum / (double) ws[i].positives.n, NULL);
+                 ws[i].positives.sum / (double) ws[i].positives.n, NULL, RC_OTHER);
 
     }
 
@@ -347,23 +348,23 @@ show_tests_box (const struct wilcoxon_state *ws,
 
       z /= sqrt (n * (n + 1) * (2*n + 1)/24.0 - ws[i].tiebreaker / 48.0);
 
-      tab_double (table, 1 + i, 1, TAB_RIGHT, z, NULL);
+      tab_double (table, 1 + i, 1, TAB_RIGHT, z, NULL, RC_OTHER);
 
       tab_double (table, 1 + i, 2, TAB_RIGHT,
                 2.0 * gsl_cdf_ugaussian_P (z),
-                NULL);
+                 NULL, RC_PVALUE);
 
       if (exact)
        {
          double p = LevelOfSignificanceWXMPSR (ws[i].positives.sum, n);
          if (p < 0)
            {
-             msg (MW, ("Too many pairs to calculate exact significance."));
+             msg (MW, _("Too many pairs to calculate exact significance."));
            }
          else
            {
-             tab_double (table, 1 + i, 3, TAB_RIGHT, p, NULL);
-             tab_double (table, 1 + i, 4, TAB_RIGHT, p / 2.0, NULL);
+             tab_double (table, 1 + i, 3, TAB_RIGHT, p, NULL, RC_PVALUE);
+             tab_double (table, 1 + i, 4, TAB_RIGHT, p / 2.0, NULL, RC_PVALUE);
            }
        }
     }