X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fmath%2Ftrimmed-mean.c;h=b643651a26aa4240e0340768b32af1c3ed37a320;hb=e5a05f16e98783e2785107059de22a44f51c18ea;hp=a687dd9b5fcffcd711ed983d0566edbb54847213;hpb=fb38178d67da062cf6bbbce5ad560aeca8e259c3;p=pspp diff --git a/src/math/trimmed-mean.c b/src/math/trimmed-mean.c index a687dd9b5f..b643651a26 100644 --- a/src/math/trimmed-mean.c +++ b/src/math/trimmed-mean.c @@ -33,10 +33,10 @@ acc (struct statistic *s, const struct ccase *cx UNUSED, double c, double cc, do struct trimmed_mean *tm = UP_CAST (s, struct trimmed_mean, parent.parent); struct order_stats *os = &tm->parent; - if ( cc > os->k[0].tc && cc <= os->k[1].tc) + if (cc > os->k[0].tc && cc <= os->k[1].tc) tm->sum += c * y; - if ( tm->cyk1p1 == SYSMIS && cc > os->k[0].tc) + if (tm->cyk1p1 == SYSMIS && cc > os->k[0].tc) tm->cyk1p1 = c * y; } @@ -52,7 +52,7 @@ destroy (struct statistic *s) struct trimmed_mean * trimmed_mean_create (double W, double tail) { - struct trimmed_mean *tm = xzalloc (sizeof (*tm)); + struct trimmed_mean *tm = XZALLOC (struct trimmed_mean); struct order_stats *os = &tm->parent; struct statistic *stat = &os->parent; @@ -88,6 +88,6 @@ trimmed_mean_calculate (const struct trimmed_mean *tm) (tm->w - os->k[1].cc - os->k[0].tc) * os->k[1].y_p1 + tm->sum - ) +) / ((1.0 - tm->tail * 2) * tm->w); }