projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
now builds frequency tables
[pspp]
/
src
/
math
/
interaction.c
diff --git
a/src/math/interaction.c
b/src/math/interaction.c
index 5dfabe99dd6c0e1ee3aba9d95626cabdf7b6babd..e61ab14e915565c284564e3359c6d15f09c13581 100644
(file)
--- a/
src/math/interaction.c
+++ b/
src/math/interaction.c
@@
-35,7
+35,7
@@
interaction_create (const struct variable *v)
struct interaction *iact = xmalloc (sizeof *iact);
iact->vars = xmalloc (sizeof *iact->vars);
iact->n_vars = 0;
struct interaction *iact = xmalloc (sizeof *iact);
iact->vars = xmalloc (sizeof *iact->vars);
iact->n_vars = 0;
- if (
v
)
+ if (
v
)
{
iact->vars[0] = v;
iact->n_vars = 1;
{
iact->vars[0] = v;
iact->n_vars = 1;
@@
-137,7
+137,7
@@
interaction_to_string (const struct interaction *iact, struct string *str)
{
ds_put_cstr (str, var_to_string (iact->vars[v]));
if (v + 1 < iact->n_vars)
{
ds_put_cstr (str, var_to_string (iact->vars[v]));
if (v + 1 < iact->n_vars)
- ds_put_cstr (str, "
*
");
+ ds_put_cstr (str, "
×
");
}
}
}
}
@@
-199,8
+199,8
@@
interaction_case_is_missing (const struct interaction *iact,
const struct ccase *c, enum mv_class exclude)
{
for (size_t i = 0; i < iact->n_vars; ++i)
const struct ccase *c, enum mv_class exclude)
{
for (size_t i = 0; i < iact->n_vars; ++i)
- if (var_is_value_missing (iact->vars[i], case_data (c, iact->vars[i])
,
-
exclude)
)
+ if (var_is_value_missing (iact->vars[i], case_data (c, iact->vars[i])
)
+
& exclude
)
return true;
return false;
return true;
return false;