Change how checking for missing values works.

[pspp] / src / language / stats / t-test-paired.c

diff --git a/src/language/stats/t-test-paired.c b/src/language/stats/t-test-paired.c
index 921233b68e52b8364c3c9e14e3496c8046cd88fd..9ec459eead84a03f252819fac9eb78ff33449a61 100644 (file)
--- a/src/language/stats/t-test-paired.c
+++ b/src/language/stats/t-test-paired.c
@@ -78,7 +78,7 @@ paired_run (const struct tt *tt, size_t n_pairs, vp *pairs, struct casereader *r
     }
 
   r = casereader_clone (reader);
-  for ( ; (c = casereader_read (r) ); case_unref (c))
+  for (; (c = casereader_read (r)); case_unref (c))
     {
       double w = dict_get_case_weight (tt->dict, c, NULL);
 
@@ -87,10 +87,10 @@ paired_run (const struct tt *tt, size_t n_pairs, vp *pairs, struct casereader *r
           struct pair_stats *pp = &ps.ps[i];
          const union value *val0 = case_data (c, pp->var0);
          const union value *val1 = case_data (c, pp->var1);
-          if (var_is_value_missing (pp->var0, val0, tt->exclude))
+          if (var_is_value_missing (pp->var0, val0) & tt->exclude)
            continue;
 
-          if (var_is_value_missing (pp->var1, val1, tt->exclude))
+          if (var_is_value_missing (pp->var1, val1) & tt->exclude)
            continue;
 
          moments_pass_one (pp->mom0, val0->f, w);
@@ -101,7 +101,7 @@ paired_run (const struct tt *tt, size_t n_pairs, vp *pairs, struct casereader *r
   casereader_destroy (r);
 
   r = reader;
-  for ( ; (c = casereader_read (r) ); case_unref (c))
+  for (; (c = casereader_read (r)); case_unref (c))
     {
       double w = dict_get_case_weight (tt->dict, c, NULL);
 
@@ -110,10 +110,10 @@ paired_run (const struct tt *tt, size_t n_pairs, vp *pairs, struct casereader *r
           struct pair_stats *pp = &ps.ps[i];
          const union value *val0 = case_data (c, pp->var0);
          const union value *val1 = case_data (c, pp->var1);
-          if (var_is_value_missing (pp->var0, val0, tt->exclude))
+          if (var_is_value_missing (pp->var0, val0) & tt->exclude)
            continue;
 
-          if (var_is_value_missing (pp->var1, val1, tt->exclude))
+          if (var_is_value_missing (pp->var1, val1) & tt->exclude)
            continue;
 
          moments_pass_two (pp->mom0, val0->f, w);
@@ -160,7 +160,7 @@ paired_summary (const struct tt *tt, struct paired_samp *os)
     {
       struct pair_stats *pp = &os->ps[i];
       struct pivot_category *pair = pivot_category_create_group__ (
-        variables->root, pivot_value_new_text_format (N_("Pair %d"), i + 1));
+        variables->root, pivot_value_new_text_format (N_("Pair %zu"), i + 1));
 
       for (int j = 0; j < 2; j++)
         {
@@ -202,7 +202,7 @@ paired_correlations (const struct tt *tt, struct paired_samp *os)
     {
       struct pair_stats *pp = &os->ps[i];
       struct pivot_category *group = pivot_category_create_group__ (
-        pairs->root, pivot_value_new_text_format (N_("Pair %d"), i + 1));
+        pairs->root, pivot_value_new_text_format (N_("Pair %zu"), i + 1));
 
       int row = pivot_category_create_leaf (
         group, pivot_value_new_text_format (N_("%s & %s"),
@@ -260,7 +260,7 @@ paired_test (const struct tt *tt, const struct paired_samp *os)
     {
       struct pair_stats *pp = &os->ps[i];
       struct pivot_category *group = pivot_category_create_group__ (
-        pairs->root, pivot_value_new_text_format (N_("Pair %d"), i + 1));
+        pairs->root, pivot_value_new_text_format (N_("Pair %zu"), i + 1));
 
       int row = pivot_category_create_leaf (
         group, pivot_value_new_text_format (N_("%s - %s"),