GNU/Linux installation/update - Use GNU/Linux wording - Remove Ubuntu

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

diff --git a/src/language/stats/friedman.c b/src/language/stats/friedman.c
index d853bd3907f299aa13829825364ab1384c1bcc6b..8fa49f7d118b07fdc17f40ba80d7bd8c0949df34 100644 (file)
--- a/src/language/stats/friedman.c
+++ b/src/language/stats/friedman.c
@@ -23,9 +23,9 @@
 #include <math.h>
 
 #include "data/casereader.h"
+#include "data/dataset.h"
 #include "data/dictionary.h"
 #include "data/format.h"
-#include "data/procedure.h"
 #include "data/variable.h"
 #include "libpspp/message.h"
 #include "libpspp/misc.h"
@@ -44,7 +44,7 @@ struct friedman
   const struct dictionary *dict;
 };
 
-static void show_ranks_box (const struct one_sample_test *ost, 
+static void show_ranks_box (const struct one_sample_test *ost,
                            const struct friedman *fr);
 
 static void show_sig_box (const struct one_sample_test *ost,
@@ -64,7 +64,7 @@ cmp_x (const void *a_, const void *b_)
 
   if (a->x < b->x)
     return -1;
-  
+
   return (a->x > b->x);
 }
 
@@ -76,7 +76,7 @@ cmp_posn (const void *a_, const void *b_)
 
   if (a->posn < b->posn)
     return -1;
-  
+
   return (a->posn > b->posn);
 }
 
@@ -99,7 +99,7 @@ friedman_execute (const struct dataset *ds,
   struct friedman_test *ft = UP_CAST (ost, struct friedman_test, parent);
   bool warn = true;
 
-  double sigma_t = 0.0;        
+  double sigma_t = 0.0;
   struct datum *row = xcalloc (ost->n_vars, sizeof *row);
   double rsq;
   struct friedman fr;
@@ -246,7 +246,7 @@ show_ranks_box (const struct one_sample_test *ost, const struct friedman *fr)
                TAB_LEFT, var_to_string (ost->vars[i]));
 
       tab_double (table, 1, row_headers + i,
-                 0, fr->rank_sum[i] / fr->cc, 0);
+                 0, fr->rank_sum[i] / fr->cc, NULL, RC_OTHER);
     }
 
   tab_submit (table);
@@ -257,7 +257,7 @@ static void
 show_sig_box (const struct one_sample_test *ost, const struct friedman *fr)
 {
   const struct friedman_test *ft = UP_CAST (ost, const struct friedman_test, parent);
-  
+
   int row = 0;
   const struct variable *weight = dict_get_weight (fr->dict);
   const struct fmt_spec *wfmt = weight ? var_get_print_format (weight) : &F_8_0;
@@ -266,6 +266,7 @@ show_sig_box (const struct one_sample_test *ost, const struct friedman *fr)
   const int column_headers = 0;
   struct tab_table *table =
     tab_create (row_headers + 1, column_headers + (ft->kendalls_w ? 5 : 4));
+  tab_set_format (table, RC_WEIGHT, wfmt);
 
   tab_headers (table, row_headers, 0, column_headers, 0);
 
@@ -296,22 +297,22 @@ show_sig_box (const struct one_sample_test *ost, const struct friedman *fr)
   tab_vline (table, TAL_2, row_headers, 0, tab_nr (table) - 1);
 
   row = 0;
-  tab_double (table, 1, column_headers + row++, 
-             0, fr->cc, wfmt);
+  tab_double (table, 1, column_headers + row++,
+             0, fr->cc, NULL, RC_WEIGHT);
 
   if (ft->kendalls_w)
-    tab_double (table, 1, column_headers + row++, 
-               0, fr->w, 0);
+    tab_double (table, 1, column_headers + row++,
+               0, fr->w, NULL, RC_OTHER);
 
-  tab_double (table, 1, column_headers + row++, 
-             0, fr->chi_sq, 0);
+  tab_double (table, 1, column_headers + row++,
+             0, fr->chi_sq, NULL, RC_OTHER);
 
-  tab_double (table, 1, column_headers + row++, 
-             0, ost->n_vars - 1, &F_8_0);
+  tab_double (table, 1, column_headers + row++,
+             0, ost->n_vars - 1, NULL, RC_INTEGER);
 
-  tab_double (table, 1, column_headers + row++, 
-             0, gsl_cdf_chisq_Q (fr->chi_sq, ost->n_vars - 1), 
-             0);
+  tab_double (table, 1, column_headers + row++,
+             0, gsl_cdf_chisq_Q (fr->chi_sq, ost->n_vars - 1),
+             NULL, RC_PVALUE);
 
   tab_submit (table);
 }