projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Replace some calls to xcalloc with XCALLOC
[pspp]
/
src
/
language
/
stats
/
mcnemar.c
diff --git
a/src/language/stats/mcnemar.c
b/src/language/stats/mcnemar.c
index 7ee52f43134afdc018548b88ff25f3e0eb0d8be3..b05f144a74bae96a3c5a6da2b0c9fc38ecfb5205 100644
(file)
--- a/
src/language/stats/mcnemar.c
+++ b/
src/language/stats/mcnemar.c
@@
-83,9
+83,9
@@
mcnemar_execute (const struct dataset *ds,
struct casereader *r = input;
struct casereader *r = input;
- struct mcnemar *mc =
xcalloc (t2s->n_pairs, sizeof *mc
);
+ struct mcnemar *mc =
XCALLOC (t2s->n_pairs, struct mcnemar
);
- for (i = 0 ; i < t2s->n_pairs; ++i
)
+ for (i = 0 ; i < t2s->n_pairs; ++i)
{
mc[i].val0.f = mc[i].val1.f = SYSMIS;
}
{
mc[i].val0.f = mc[i].val1.f = SYSMIS;
}
@@
-94,7
+94,7
@@
mcnemar_execute (const struct dataset *ds,
{
const double weight = dict_get_case_weight (dict, c, &warn);
{
const double weight = dict_get_case_weight (dict, c, &warn);
- for (i = 0 ; i < t2s->n_pairs; ++i
)
+ for (i = 0 ; i < t2s->n_pairs; ++i)
{
variable_pair *vp = &t2s->pairs[i];
const union value *value0 = case_data (c, (*vp)[0]);
{
variable_pair *vp = &t2s->pairs[i];
const union value *value0 = case_data (c, (*vp)[0]);
@@
-107,7
+107,7
@@
mcnemar_execute (const struct dataset *ds,
continue;
continue;
- if (
mc[i].val0.f == SYSMIS)
+ if (mc[i].val0.f == SYSMIS)
{
if (mc[i].val1.f != value0->f)
mc[i].val0.f = value0->f;
{
if (mc[i].val1.f != value0->f)
mc[i].val0.f = value0->f;
@@
-115,7
+115,7
@@
mcnemar_execute (const struct dataset *ds,
mc[i].val0.f = value1->f;
}
mc[i].val0.f = value1->f;
}
- if (
mc[i].val1.f == SYSMIS)
+ if (mc[i].val1.f == SYSMIS)
{
if (mc[i].val0.f != value1->f)
mc[i].val1.f = value1->f;
{
if (mc[i].val0.f != value1->f)
mc[i].val1.f = value1->f;
@@
-127,15
+127,15
@@
mcnemar_execute (const struct dataset *ds,
{
mc[i].n00 += weight;
}
{
mc[i].n00 += weight;
}
- else if (
mc[i].val0.f == value0->f && mc[i].val1.f == value1->f)
+ else if (mc[i].val0.f == value0->f && mc[i].val1.f == value1->f)
{
mc[i].n10 += weight;
}
{
mc[i].n10 += weight;
}
- else if (
mc[i].val1.f == value0->f && mc[i].val0.f == value1->f)
+ else if (mc[i].val1.f == value0->f && mc[i].val0.f == value1->f)
{
mc[i].n01 += weight;
}
{
mc[i].n01 += weight;
}
- else if (
mc[i].val1.f == value0->f && mc[i].val1.f == value1->f)
+ else if (mc[i].val1.f == value0->f && mc[i].val1.f == value1->f)
{
mc[i].n11 += weight;
}
{
mc[i].n11 += weight;
}