More tests for totals and subtotals, with fixes.

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

diff --git a/src/language/stats/roc.c b/src/language/stats/roc.c
index 1a4fcba65783c7e590e47cb67345e9641cff1c7f..031110a046a235f5ab0e72df4837f83a2a3cf636 100644 (file)
--- a/src/language/stats/roc.c
+++ b/src/language/stats/roc.c
@@ -335,7 +335,7 @@ dump_casereader (struct casereader *reader)
   for (; (c = casereader_read (r)); case_unref (c))
     {
       int i;
-      for (i = 0 ; i < case_get_value_cnt (c); ++i)
+      for (i = 0 ; i < case_get_n_values (c); ++i)
         printf ("%g ", case_num_idx (c, i));
       printf ("\n");
     }
@@ -674,7 +674,8 @@ prepare_cutpoints (struct cmd_roc *roc, struct roc_state *rs, struct casereader
          const union value *v = case_data (c, roc->vars[i]);
          const double result = v->f;
 
-         if (mv_is_value_missing (var_get_missing_values (roc->vars[i]), v, roc->exclude))
+         if (mv_is_value_missing (var_get_missing_values (roc->vars[i]), v)
+              & roc->exclude)
            continue;
 
          minimize (&rs[i].min, result);