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

Diff of /pspp/src/oneway.q

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

revision 1.20 by blp, Sun Jul 31 21:42:46 2005 UTC revision 1.21 by blp, Sun Aug 7 04:39:28 2005 UTC
# Line 87  static int ostensible_number_of_groups=- Line 87  static int ostensible_number_of_groups=-
87    
88    
89  /* Function to use for testing for missing values */  /* Function to use for testing for missing values */
90  static is_missing_func value_is_missing;  static is_missing_func *value_is_missing;
91    
92    
93  static void run_oneway(const struct casefile *cf, void *_mode);  static void run_oneway(const struct casefile *cf, void *_mode);
# Line 119  cmd_oneway(void) Line 119  cmd_oneway(void)
119    
120    /* If /MISSING=INCLUDE is set, then user missing values are ignored */    /* If /MISSING=INCLUDE is set, then user missing values are ignored */
121    if (cmd.incl == ONEWAY_INCLUDE )    if (cmd.incl == ONEWAY_INCLUDE )
122      value_is_missing = is_system_missing;      value_is_missing = mv_is_value_system_missing;
123    else    else
124      value_is_missing = is_missing;      value_is_missing = mv_is_value_missing;
125    
126    /* What statistics were requested */    /* What statistics were requested */
127    if ( cmd.sbc_statistics )    if ( cmd.sbc_statistics )
# Line 913  run_oneway(const struct casefile *cf, vo Line 913  run_oneway(const struct casefile *cf, vo
913        const union value *indep_val = case_data (&c, indep_var->fv);        const union value *indep_val = case_data (&c, indep_var->fv);
914    
915        /* Deal with missing values */        /* Deal with missing values */
916        if ( value_is_missing(indep_val,indep_var) )        if ( value_is_missing(&indep_var->miss, indep_val) )
917          continue;          continue;
918    
919        /* Skip the entire case if /MISSING=LISTWISE is set */        /* Skip the entire case if /MISSING=LISTWISE is set */
# Line 924  run_oneway(const struct casefile *cf, vo Line 924  run_oneway(const struct casefile *cf, vo
924                const struct variable *v = vars[i];                const struct variable *v = vars[i];
925                const union value *val = case_data (&c, v->fv);                const union value *val = case_data (&c, v->fv);
926    
927                if (value_is_missing(val,v) )                if (value_is_missing(&v->miss, val) )
928                  break;                  break;
929              }              }
930            if ( i != n_vars )            if ( i != n_vars )
# Line 964  run_oneway(const struct casefile *cf, vo Line 964  run_oneway(const struct casefile *cf, vo
964                hsh_insert ( group_hash, (void *) gs );                hsh_insert ( group_hash, (void *) gs );
965              }              }
966                        
967            if (! value_is_missing(val,v) )            if (! value_is_missing(&v->miss, val) )
968              {              {
969                struct group_statistics *totals = &gp->ugs;                struct group_statistics *totals = &gp->ugs;
970    

Legend:
Removed from v.1.20  
changed lines
  Added in v.1.21

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