projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Rewrote categorical value-handling
[pspp]
/
src
/
expressions
/
operations.def
diff --git
a/src/expressions/operations.def
b/src/expressions/operations.def
index 0d21c16a65e10bf06229fb115fc794f2d3d03118..bd5af76c4e68ad6d35e067f59f518d20220b7f73 100644
(file)
--- a/
src/expressions/operations.def
+++ b/
src/expressions/operations.def
@@
-896,7
+896,7
@@
no_opt operator VEC_ELEM_NUM (idx)
{
const struct variable *var = v->var[(int) idx - 1];
double value = case_num (c, var->fv);
{
const struct variable *var = v->var[(int) idx - 1];
double value = case_num (c, var->fv);
- return !
is_num_user_missing (value, var
) ? value : SYSMIS;
+ return !
mv_is_num_user_missing (&var->miss, value
) ? value : SYSMIS;
}
else
{
}
else
{
@@
-943,7
+943,7
@@
no_opt operator NUM_VAR ()
num_var v;
{
double d = case_num (c, v->fv);
num_var v;
{
double d = case_num (c, v->fv);
- return !
is_num_user_missing (d, v
) ? d : SYSMIS;
+ return !
mv_is_num_user_missing (&v->miss, d
) ? d : SYSMIS;
}
no_opt string operator STR_VAR ()
}
no_opt string operator STR_VAR ()
@@
-962,7
+962,7
@@
no_opt function LAG (num_var v, pos_int n_before)
if (c != NULL)
{
double x = case_num (c, v->fv);
if (c != NULL)
{
double x = case_num (c, v->fv);
- return !
is_num_user_missing (x, v
) ? x : SYSMIS;
+ return !
mv_is_num_user_missing (&v->miss, x
) ? x : SYSMIS;
}
else
return SYSMIS;
}
else
return SYSMIS;
@@
-974,7
+974,7
@@
no_opt function LAG (num_var v)
if (c != NULL)
{
double x = case_num (c, v->fv);
if (c != NULL)
{
double x = case_num (c, v->fv);
- return !
is_num_user_missing (x, v
) ? x : SYSMIS;
+ return !
mv_is_num_user_missing (&v->miss, x
) ? x : SYSMIS;
}
else
return SYSMIS;
}
else
return SYSMIS;