projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
CROSSTABS: Improve error messages and coding style.
[pspp]
/
src
/
language
/
stats
/
median.c
diff --git
a/src/language/stats/median.c
b/src/language/stats/median.c
index 8fa38c5a692134506e5c71ff67255ee2c487378d..c15108896ba575ca508a4dd14dc62089f668d5cb 100644
(file)
--- a/
src/language/stats/median.c
+++ b/
src/language/stats/median.c
@@
-159,7
+159,7
@@
median_execute (const struct dataset *ds,
for (; (c = casereader_read (rr)) != NULL;)
{
for (; (c = casereader_read (rr)) != NULL;)
{
- if (var_is_value_missing (var, case_data (c, var)
, exclude)
)
+ if (var_is_value_missing (var, case_data (c, var)
) & exclude
)
{
case_unref (c);
continue;
{
case_unref (c);
continue;
@@
-168,7
+168,7
@@
median_execute (const struct dataset *ds,
cc += dict_get_case_weight (dict, c, &warn);
casewriter_write (writer, c);
}
cc += dict_get_case_weight (dict, c, &warn);
casewriter_write (writer, c);
}
- subcase_
destroy
(&sc);
+ subcase_
uninit
(&sc);
casereader_destroy (rr);
rr = casewriter_make_reader (writer);
casereader_destroy (rr);
rr = casewriter_make_reader (writer);
@@
-196,7
+196,7
@@
median_execute (const struct dataset *ds,
const union value *val = case_data (c, var);
const union value *indep_val = case_data (c, nst->indep_var);
const union value *val = case_data (c, var);
const union value *indep_val = case_data (c, nst->indep_var);
- if (var_is_value_missing (var, case_data (c, var)
, exclude)
)
+ if (var_is_value_missing (var, case_data (c, var)
) & exclude
)
{
continue;
}
{
continue;
}
@@
-253,7
+253,7
@@
median_execute (const struct dataset *ds,
}
results[v].n = count;
}
results[v].n = count;
- results[v].sorted_array =
xcalloc (hmap_count (&map), sizeof (void*)
);
+ results[v].sorted_array =
XCALLOC (hmap_count (&map), struct val_node *
);
results[v].var = var;
HMAP_FOR_EACH (vn, struct val_node, node, &map)
results[v].var = var;
HMAP_FOR_EACH (vn, struct val_node, node, &map)