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

Diff of /pspp/src/dictionary.c

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

revision 1.25 by blp, Sun Jul 31 21:42:46 2005 UTC revision 1.26 by blp, Sun Aug 7 04:39:28 2005 UTC
# Line 279  dict_create_var (struct dictionary *d, c Line 279  dict_create_var (struct dictionary *d, c
279    v->init = 1;    v->init = 1;
280    v->reinit = dict_class_from_id (v->name) != DC_SCRATCH;    v->reinit = dict_class_from_id (v->name) != DC_SCRATCH;
281    v->index = d->var_cnt;    v->index = d->var_cnt;
282    v->miss_type = MISSING_NONE;    mv_init (&v->miss, width);
283    if (v->type == NUMERIC)    if (v->type == NUMERIC)
284      {      {
285        v->print = f8_2;        v->print = f8_2;
# Line 354  dict_clone_var (struct dictionary *d, co Line 354  dict_clone_var (struct dictionary *d, co
354       the same short name. */       the same short name. */
355    nv->init = 1;    nv->init = 1;
356    nv->reinit = ov->reinit;    nv->reinit = ov->reinit;
357    nv->miss_type = ov->miss_type;    mv_copy (&nv->miss, &ov->miss);
   memcpy (nv->missing, ov->missing, sizeof nv->missing);  
358    nv->print = ov->print;    nv->print = ov->print;
359    nv->write = ov->write;    nv->write = ov->write;
360    val_labs_destroy (nv->val_labs);    val_labs_destroy (nv->val_labs);
# Line 678  dict_get_case_weight (const struct dicti Line 677  dict_get_case_weight (const struct dicti
677    else    else
678      {      {
679        double w = case_num (c, d->weight->fv);        double w = case_num (c, d->weight->fv);
680        if ( w < 0.0 || w == SYSMIS || is_num_user_missing(w, d->weight) )        if (w < 0.0 || mv_is_num_missing (&d->weight->miss, w))
681          w = 0.0;          w = 0.0;
682        if ( w == 0.0 && *warn_on_invalid ) {        if ( w == 0.0 && *warn_on_invalid ) {
683            *warn_on_invalid = 0;            *warn_on_invalid = 0;

Legend:
Removed from v.1.25  
changed lines
  Added in v.1.26

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