Make the missing value code do more work, so that its callers can do

[pspp-builds.git] / src / language / stats / examine.q

diff --git a/src/language/stats/examine.q b/src/language/stats/examine.q
index b337131c9ef3ff32802c370a64f351d4140fae2e..abbf9fc3890aada913b5b771fb57353d2362dd4d 100644 (file)
--- a/src/language/stats/examine.q
+++ b/src/language/stats/examine.q
@@ -1,7 +1,6 @@
 /* PSPP - EXAMINE data for normality . -*-c-*-
 
 Copyright (C) 2004 Free Software Foundation, Inc.
-Author: John Darrington 2004, 2006
 
 This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License as
@@ -179,9 +178,8 @@ const char *factor_to_string_concise (const struct factor *fctr,
 
 
 
-/* Function to use for testing for missing values */
-static var_is_missing_func *value_is_missing;
-
+/* Categories of missing values to exclude. */
+static enum mv_class exclude_values;
 
 /* PERCENTILES */
 
@@ -207,10 +205,7 @@ cmd_examine (struct lexer *lexer, struct dataset *ds)
     }
 
   /* If /MISSING=INCLUDE is set, then user missing values are ignored */
-  if (cmd.incl == XMN_INCLUDE )
-    value_is_missing = var_is_value_system_missing;
-  else
-    value_is_missing = var_is_value_missing;
+  exclude_values = cmd.incl == XMN_INCLUDE ? MV_SYSTEM : MV_ANY;
 
   if ( cmd.st_n == SYSMIS )
     cmd.st_n = 5;
@@ -649,13 +644,13 @@ factor_calc (const struct ccase *c, int case_no, double weight,
       union value *indep_vals[2] ;
 
       indep_vals[0] = value_dup (
-                                case_data (c, fctr->indep_var[0]->fv),
+                                case_data (c, fctr->indep_var[0]),
                                 var_get_width (fctr->indep_var[0])
                                 );
 
       if ( fctr->indep_var[1] )
        indep_vals[1] = value_dup (
-                                  case_data (c, fctr->indep_var[1]->fv),
+                                  case_data (c, fctr->indep_var[1]),
                                   var_get_width (fctr->indep_var[1])
                                   );
       else
@@ -692,11 +687,11 @@ factor_calc (const struct ccase *c, int case_no, double weight,
        {
          const struct variable *var = dependent_vars[v];
          union value *val = value_dup (
-                                       case_data (c, var->fv),
+                                       case_data (c, var),
                                        var_get_width (var)
                                        );
 
-         if ( value_is_missing (var, val) || case_missing )
+         if (case_missing || var_is_value_missing (var, val, exclude_values))
            {
              free (val);
              continue;
@@ -759,11 +754,11 @@ run_examine (const struct ccase *first, const struct casefile *cf,
            {
              const struct variable *var = dependent_vars[v];
              union value *val = value_dup (
-                                                 case_data (&c, var->fv),
+                                                 case_data (&c, var),
                                                  var_get_width (var)
                                                  );
 
-             if ( value_is_missing (var, val))
+             if ( var_is_value_missing (var, val, exclude_values))
                case_missing = 1;
 
              free (val);
@@ -774,11 +769,12 @@ run_examine (const struct ccase *first, const struct casefile *cf,
        {
          const struct variable *var = dependent_vars[v];
          union value *val = value_dup (
-                                       case_data (&c, var->fv),
+                                       case_data (&c, var),
                                        var_get_width (var)
                                        );
 
-         if ( value_is_missing (var, val) || case_missing )
+         if ( var_is_value_missing (var, val, exclude_values)
+               || case_missing )
            {
              free (val) ;
              continue ;
@@ -1059,8 +1055,8 @@ show_summary (struct variable **dependent_var, int n_dep_var,
                            (i * n_factors ) + count +
                            heading_rows,
                            TAB_LEFT | TAT_TITLE,
-                           value_to_string ((*fs)->id[0],
-                                            fctr->indep_var[0])
+                           var_get_value_name (fctr->indep_var[0],
+                                                (*fs)->id[0])
                            );
 
                  if (fctr->indep_var[1] && count > 0 )
@@ -1078,7 +1074,7 @@ show_summary (struct variable **dependent_var, int n_dep_var,
                          (i * n_factors ) + count +
                          heading_rows,
                          TAB_LEFT | TAT_TITLE,
-                         value_to_string ((*fs)->id[1], fctr->indep_var[1])
+                         var_get_value_name (fctr->indep_var[1], (*fs)->id[1])
                          );
 
              populate_summary (tbl, heading_columns,
@@ -1234,7 +1230,8 @@ show_extremes (struct variable **dependent_var, int n_dep_var,
                  tab_text (tbl,
                            1, row,
                            TAB_LEFT | TAT_TITLE,
-                           value_to_string ((*fs)->id[0], fctr->indep_var[0])
+                           var_get_value_name (fctr->indep_var[0],
+                                                (*fs)->id[0])
                            );
                }
 
@@ -1246,7 +1243,7 @@ show_extremes (struct variable **dependent_var, int n_dep_var,
              if ( fctr->indep_var[1])
                tab_text (tbl, 2, row,
                          TAB_LEFT | TAT_TITLE,
-                         value_to_string ((*fs)->id[1], fctr->indep_var[1])
+                         var_get_value_name (fctr->indep_var[1], (*fs)->id[1])
                          );
 
              populate_extremes (tbl, heading_columns - 2,
@@ -1471,7 +1468,8 @@ show_descriptives (struct variable **dependent_var,
                  tab_text (tbl,
                            1, row,
                            TAB_LEFT | TAT_TITLE,
-                           value_to_string ((*fs)->id[0], fctr->indep_var[0])
+                           var_get_value_name (fctr->indep_var[0],
+                                                (*fs)->id[0])
                            );
                }
 
@@ -1483,7 +1481,7 @@ show_descriptives (struct variable **dependent_var,
              if ( fctr->indep_var[1])
                tab_text (tbl, 2, row,
                          TAB_LEFT | TAT_TITLE,
-                         value_to_string ((*fs)->id[1], fctr->indep_var[1])
+                         var_get_value_name (fctr->indep_var[1], (*fs)->id[1])
                          );
 
              populate_descriptives (tbl, heading_columns - 2,
@@ -2097,7 +2095,8 @@ show_percentiles (struct variable **dependent_var,
                  tab_text (tbl,
                            1, row,
                            TAB_LEFT | TAT_TITLE,
-                           value_to_string ((*fs)->id[0], fctr->indep_var[0])
+                           var_get_value_name (fctr->indep_var[0],
+                                                (*fs)->id[0])
                            );
 
 
@@ -2111,7 +2110,7 @@ show_percentiles (struct variable **dependent_var,
              if ( fctr->indep_var[1])
                tab_text (tbl, 2, row,
                          TAB_LEFT | TAT_TITLE,
-                         value_to_string ((*fs)->id[1], fctr->indep_var[1])
+                         var_get_value_name (fctr->indep_var[1], (*fs)->id[1])
                          );
 
 
@@ -2213,7 +2212,7 @@ factor_to_string (const struct factor *fctr,
 
   snprintf (buf2, 100, "%s = %s",
           var_to_string (fctr->indep_var[0]),
-          value_to_string (fs->id[0], fctr->indep_var[0]));
+           var_get_value_name (fctr->indep_var[0], fs->id[0]));
 
   strcat (buf1, buf2);
 
@@ -2221,8 +2220,7 @@ factor_to_string (const struct factor *fctr,
     {
       sprintf (buf2, "; %s = %s)",
              var_to_string (fctr->indep_var[1]),
-             value_to_string (fs->id[1],
-                             fctr->indep_var[1]));
+              var_get_value_name (fctr->indep_var[1], fs->id[1]));
       strcat (buf1, buf2);
     }
   else
@@ -2247,11 +2245,12 @@ factor_to_string_concise (const struct factor *fctr,
   char buf2[100];
 
   snprintf (buf, 100, "%s",
-          value_to_string (fs->id[0], fctr->indep_var[0]));
+            var_get_value_name (fctr->indep_var[0], fs->id[0]));
 
   if ( fctr->indep_var[1] )
     {
-      sprintf (buf2, ",%s)", value_to_string (fs->id[1], fctr->indep_var[1]) );
+      sprintf (buf2, ",%s)", var_get_value_name (fctr->indep_var[1],
+                                                 fs->id[1]) );
       strcat (buf, buf2);
     }