/[pspp]/pspp/src/descript.c
ViewVC logotype

Diff of /pspp/src/descript.c

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

revision 1.14 by blp, Sun Jul 31 21:42:46 2005 UTC revision 1.15 by blp, Sun Aug 7 04:39:28 2005 UTC
# Line 583  descriptives_trns_proc (struct trns_head Line 583  descriptives_trns_proc (struct trns_head
583        for (vars = t->vars; vars < t->vars + t->var_cnt; vars++)        for (vars = t->vars; vars < t->vars + t->var_cnt; vars++)
584          {          {
585            double score = case_num (c, (*vars)->fv);            double score = case_num (c, (*vars)->fv);
586            if ( score == SYSMIS || (!t->include_user_missing            if ( score == SYSMIS
587                                     && is_num_user_missing(score, *vars)) )                 || (!t->include_user_missing
588                       && mv_is_num_user_missing (&(*vars)->miss, score)))
589              {              {
590                all_sysmis = 1;                all_sysmis = 1;
591                break;                break;
# Line 599  descriptives_trns_proc (struct trns_head Line 600  descriptives_trns_proc (struct trns_head
600    
601        if (z->mean == SYSMIS || z->std_dev == SYSMIS        if (z->mean == SYSMIS || z->std_dev == SYSMIS
602            || all_sysmis || input == SYSMIS            || all_sysmis || input == SYSMIS
603            || (!t->include_user_missing && is_num_user_missing(input, z->v)))            || (!t->include_user_missing
604                  && mv_is_num_user_missing (&z->v->miss, input)))
605          *output = SYSMIS;          *output = SYSMIS;
606        else        else
607          *output = (input - z->mean) / z->std_dev;          *output = (input - z->mean) / z->std_dev;
# Line 739  calc_descriptives (const struct casefile Line 741  calc_descriptives (const struct casefile
741            if (dsc->missing_type != DSC_LISTWISE            if (dsc->missing_type != DSC_LISTWISE
742                && (x == SYSMIS                && (x == SYSMIS
743                    || (!dsc->include_user_missing                    || (!dsc->include_user_missing
744                        && is_num_user_missing (x, dv->v))))                        && mv_is_num_user_missing (&dv->v->miss, x))))
745              {              {
746                dv->missing += weight;                dv->missing += weight;
747                continue;                continue;
# Line 781  calc_descriptives (const struct casefile Line 783  calc_descriptives (const struct casefile
783                if (dsc->missing_type != DSC_LISTWISE                if (dsc->missing_type != DSC_LISTWISE
784                    && (x == SYSMIS                    && (x == SYSMIS
785                        || (!dsc->include_user_missing                        || (!dsc->include_user_missing
786                            && is_num_user_missing (x, dv->v))))                            && mv_is_num_user_missing (&dv->v->miss, x))))
787                  continue;                  continue;
788    
789                if (dv->moments != NULL)                if (dv->moments != NULL)
# Line 844  listwise_missing (struct dsc_proc *dsc, Line 846  listwise_missing (struct dsc_proc *dsc,
846        double x = case_num (c, dv->v->fv);        double x = case_num (c, dv->v->fv);
847    
848        if (x == SYSMIS        if (x == SYSMIS
849            || (!dsc->include_user_missing && is_num_user_missing (x, dv->v)))            || (!dsc->include_user_missing
850                  && mv_is_num_user_missing (&dv->v->miss, x)))
851          return 1;          return 1;
852      }      }
853    return 0;    return 0;

Legend:
Removed from v.1.14  
changed lines
  Added in v.1.15

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