X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Flanguage%2Fstats%2Fsign.c;h=d5970c6ff0a61297803374c92755762cdca1f6d0;hb=41009f9ff6541a025357fd8e06fcdaf5220e48fa;hp=b76d9e33ebc59ae43db95f04339b344469c34434;hpb=9e0e4996fad6563f0a1ce628b80db5c23ef8279e;p=pspp-builds.git

diff --git a/src/language/stats/sign.c b/src/language/stats/sign.c
index b76d9e33..d5970c6f 100644
--- a/src/language/stats/sign.c
+++ b/src/language/stats/sign.c
@@ -17,8 +17,6 @@
 #include <config.h>
 #include "sign.h"
 
-#include <xalloc.h>
-
 #include <data/variable.h>
 #include <libpspp/str.h>
 #include <output/table.h>
@@ -31,6 +29,9 @@
 #include <data/casereader.h>
 #include <data/format.h>
 
+#include "minmax.h"
+#include "xalloc.h"
+
 #include "gettext.h"
 #define _(msgid) gettext (msgid)
 
@@ -51,12 +52,12 @@ output_frequency_table (const struct two_sample_test *t2s,
 			const struct dictionary *dict)
 {
   int i;
-  struct tab_table *table = tab_create (3, 1 + 4 * t2s->n_pairs, 0);
+  struct tab_table *table = tab_create (3, 1 + 4 * t2s->n_pairs);
 
   const struct variable *wv = dict_get_weight (dict);
   const struct fmt_spec *wfmt = wv ? var_get_print_format (wv) : & F_8_0;
 
-  tab_dim (table, tab_natural_dimensions);
+  tab_dim (table, tab_natural_dimensions, NULL, NULL);
 
   tab_title (table, _("Frequencies"));
 
@@ -64,11 +65,11 @@ output_frequency_table (const struct two_sample_test *t2s,
 
   /* Vertical lines inside the box */
   tab_box (table, 0, 0, -1, TAL_1,
-	   1, 0, table->nc - 1, tab_nr (table) - 1 );
+	   1, 0, tab_nc (table) - 1, tab_nr (table) - 1 );
 
   /* Box around entire table */
   tab_box (table, TAL_2, TAL_2, -1, -1,
-	   0, 0, table->nc - 1, tab_nr (table) - 1 );
+	   0, 0, tab_nc (table) - 1, tab_nr (table) - 1 );
 
   tab_text (table,  2, 0,  TAB_CENTER, _("N"));
 
@@ -85,7 +86,7 @@ output_frequency_table (const struct two_sample_test *t2s,
 
       ds_destroy (&pair_name);
 
-      tab_hline (table, TAL_1, 0, table->nc - 1, 1 + i * 4);
+      tab_hline (table, TAL_1, 0, tab_nc (table) - 1, 1 + i * 4);
 
       tab_text (table,  1, 1 + i * 4,  TAB_LEFT, _("Negative Differences"));
       tab_text (table,  1, 2 + i * 4,  TAB_LEFT, _("Positive Differences"));
@@ -107,26 +108,26 @@ output_statistics_table (const struct two_sample_test *t2s,
 			 const struct sign_test_params *param)
 {
   int i;
-  struct tab_table *table = tab_create (1 + t2s->n_pairs, 4, 0);
+  struct tab_table *table = tab_create (1 + t2s->n_pairs, 4);
 
-  tab_dim (table, tab_natural_dimensions);
+  tab_dim (table, tab_natural_dimensions, NULL, NULL);
 
   tab_title (table, _("Test Statistics"));
 
   tab_headers (table, 0, 1,  0, 1);
 
-  tab_hline (table, TAL_2, 0, table->nc - 1, 1);
-  tab_vline (table, TAL_2, 1, 0, table->nr - 1);
+  tab_hline (table, TAL_2, 0, tab_nc (table) - 1, 1);
+  tab_vline (table, TAL_2, 1, 0, tab_nr (table) - 1);
 
 
   /* Vertical lines inside the box */
   tab_box (table, -1, -1, -1, TAL_1,
 	   0, 0,
-	   table->nc - 1, tab_nr (table) - 1);
+	   tab_nc (table) - 1, tab_nr (table) - 1);
 
   /* Box around entire table */
   tab_box (table, TAL_2, TAL_2, -1, -1,
-	   0, 0, table->nc - 1,
+	   0, 0, tab_nc (table) - 1,
 	   tab_nr (table) - 1);
 
   tab_text (table,  0, 1, TAT_TITLE | TAB_LEFT,