Added the /WILCOXON subcommand to NPAR TESTS

[pspp-builds.git] / src / language / stats / chisquare.c

diff --git a/src/language/stats/chisquare.c b/src/language/stats/chisquare.c
index 1b8392724db880a3fdae76187a9e4b2a08ccbe57..ed143824187593f984324bc39afeaf810c0080df 100644 (file)
--- a/src/language/stats/chisquare.c
+++ b/src/language/stats/chisquare.c
@@ -29,7 +29,6 @@
 #include <data/variable.h>
 #include <language/stats/freq.h>
 #include <language/stats/npar.h>
-#include <libpspp/alloc.h>
 #include <libpspp/assertion.h>
 #include <libpspp/compiler.h>
 #include <libpspp/hash.h>
@@ -39,6 +38,8 @@
 
 #include <gsl/gsl_cdf.h>
 
+#include "xalloc.h"
+
 #include "gettext.h"
 #define _(msgid) gettext (msgid)
 
@@ -319,7 +320,9 @@ void
 chisquare_execute (const struct dataset *ds,
                   struct casereader *input,
                    enum mv_class exclude,
-                  const struct npar_test *test)
+                  const struct npar_test *test,
+                  bool exact UNUSED,
+                  double timer UNUSED)
 {
   const struct dictionary *dict = dataset_dict (ds);
   int v, i;
@@ -343,7 +346,8 @@ chisquare_execute (const struct dataset *ds,
          struct hsh_table *freq_hash = NULL;
           struct casereader *reader =
             casereader_create_filter_missing (casereader_clone (input),
-                                              &ost->vars[v], 1, exclude, NULL);
+                                              &ost->vars[v], 1, exclude,
+                                             NULL, NULL);
          struct tab_table *freq_table =
             create_variable_frequency_table(dict, reader, cst, v, &freq_hash);
 
@@ -361,12 +365,17 @@ chisquare_execute (const struct dataset *ds,
          xsq[v] = 0.0;
          for ( i = 0 ; i < n_cells ; ++i )
            {
+             struct string str;
              double exp;
              const union value *observed_value = ff[i]->value;
 
+             ds_init_empty (&str);
+             var_append_value_name (ost->vars[v], observed_value, &str);
+
              /* The key */
-             tab_text (freq_table, 0, i + 1, TAB_LEFT,
-                       var_get_value_name (ost->vars[v], observed_value));
+             tab_text (freq_table, 0, i + 1, TAB_LEFT, ds_cstr (&str));
+             ds_destroy (&str);
+
 
              /* The observed N */
              tab_float (freq_table, 1, i + 1, TAB_NONE,
@@ -408,7 +417,8 @@ chisquare_execute (const struct dataset *ds,
          double total_obs = 0.0;
           struct casereader *reader =
             casereader_create_filter_missing (casereader_clone (input),
-                                              &ost->vars[v], 1, exclude, NULL);
+                                              &ost->vars[v], 1, exclude,
+                                             NULL, NULL);
          struct hsh_table *freq_hash =
            create_freq_hash_with_range (dict, reader,
                                          ost->vars[v], cst->lo, cst->hi);
@@ -427,13 +437,17 @@ chisquare_execute (const struct dataset *ds,
          xsq[v] = 0.0;
          for ( i = 0 ; i < hsh_count (freq_hash) ; ++i )
            {
+             struct string str;
              double exp;
 
              const union value *observed_value = ff[i]->value;
 
+             ds_init_empty (&str);
+             var_append_value_name (ost->vars[v], observed_value, &str);
              /* The key */
              tab_text  (freq_table, v * 4 + 1, i + 2 , TAB_LEFT,
-                        var_get_value_name (ost->vars[v], observed_value));
+                        ds_cstr (&str));
+             ds_destroy (&str);
 
              /* The observed N */
              tab_float (freq_table, v * 4 + 2, i + 2 , TAB_NONE,