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)
- tm->sum += c * y;
+ if (cc > os->k[0].tc && cc <= os->k[1].tc)
+ tm->sum += c * y;
- if ( tm->cyk1p1 == SYSMIS && cc >os->k[0].tc)
- tm->cyk1p1 = c * y;
+ if (tm->cyk1p1 == SYSMIS && cc > os->k[0].tc)
+ tm->cyk1p1 = c * y;
}
static void
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;
return
(
- (os->k[0].cc_p1 - os->k[0].tc) * os->k[0].y_p1
- -
- (os->k[1].cc - os->k[1].tc) * os->k[1].y_p1
+ (os->k[0].cc - os->k[0].tc) * os->k[0].y_p1
+
- tm->sum
- -
- tm->cyk1p1
- )
- /
- ( (1.0 - 2 * tm->tail) * tm->w);
+ (tm->w - os->k[1].cc - os->k[0].tc) * os->k[1].y_p1
+ +
+ tm->sum
+)
+ / ((1.0 - tm->tail * 2) * tm->w);
}