/[pspp]/pspp/src/examine.q
ViewVC logotype

Diff of /pspp/src/examine.q

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1.28 by blp, Sun Jul 31 21:42:46 2005 UTC revision 1.29 by blp, Sun Aug 7 04:39:28 2005 UTC
# Line 169  const char *factor_to_string_concise(con Line 169  const char *factor_to_string_concise(con
169    
170    
171  /* Function to use for testing for missing values */  /* Function to use for testing for missing values */
172  static is_missing_func value_is_missing;  static is_missing_func *value_is_missing;
173    
174    
175  /* PERCENTILES */  /* PERCENTILES */
# Line 193  cmd_examine(void) Line 193  cmd_examine(void)
193    
194    /* If /MISSING=INCLUDE is set, then user missing values are ignored */    /* If /MISSING=INCLUDE is set, then user missing values are ignored */
195    if (cmd.incl == XMN_INCLUDE )    if (cmd.incl == XMN_INCLUDE )
196      value_is_missing = is_system_missing;      value_is_missing = mv_is_value_system_missing;
197    else    else
198      value_is_missing = is_missing;      value_is_missing = mv_is_value_missing;
199    
200    if ( cmd.st_n == SYSMIS )    if ( cmd.st_n == SYSMIS )
201      cmd.st_n = 5;      cmd.st_n = 5;
# Line 650  factor_calc(struct ccase *c, int case_no Line 650  factor_calc(struct ccase *c, int case_no
650            const struct variable *var = dependent_vars[v];            const struct variable *var = dependent_vars[v];
651            const union value *val = case_data (c, var->fv);            const union value *val = case_data (c, var->fv);
652    
653            if ( value_is_missing(val,var) || case_missing )            if ( value_is_missing (&var->miss, val) || case_missing )
654              val = 0;              val = 0;
655                        
656            metrics_calc( &(*foo)->m[v], val, weight, case_no);            metrics_calc( &(*foo)->m[v], val, weight, case_no);
# Line 712  run_examine(const struct casefile *cf, v Line 712  run_examine(const struct casefile *cf, v
712                const struct variable *var = dependent_vars[v];                const struct variable *var = dependent_vars[v];
713                const union value *val = case_data (&c, var->fv);                const union value *val = case_data (&c, var->fv);
714    
715                if ( value_is_missing(val,var))                if ( value_is_missing(&var->miss, val))
716                  case_missing = 1;                  case_missing = 1;
717                                        
718              }              }
# Line 723  run_examine(const struct casefile *cf, v Line 723  run_examine(const struct casefile *cf, v
723            const struct variable *var = dependent_vars[v];            const struct variable *var = dependent_vars[v];
724            const union value *val = case_data (&c, var->fv);            const union value *val = case_data (&c, var->fv);
725    
726            if ( value_is_missing(val,var) || case_missing )            if ( value_is_missing(&var->miss, val) || case_missing )
727              val = 0;              val = 0;
728    
729            metrics_calc(&totals[v], val, weight, case_no);            metrics_calc(&totals[v], val, weight, case_no);

Legend:
Removed from v.1.28  
changed lines
  Added in v.1.29

savannah-hackers-public@gnu.org
ViewVC Help
Powered by ViewVC 1.1.26