/* PSPP - a program for statistical analysis.
- Copyright (C) 2008, 2009 Free Software Foundation, Inc.
+ Copyright (C) 2008, 2009, 2011 Free Software Foundation, Inc.
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
along with this program. If not, see <http://www.gnu.org/licenses/>. */
#include <config.h>
-#include "trimmed-mean.h"
-#include <math/order-stats.h>
-#include <gl/xalloc.h>
-#include <libpspp/assertion.h>
-#include <libpspp/cast.h>
+#include "math/trimmed-mean.h"
+
#include <math.h>
-#include <data/val-type.h>
+#include "data/val-type.h"
+#include "libpspp/assertion.h"
+#include "libpspp/cast.h"
+#include "math/order-stats.h"
+
+#include "gl/xalloc.h"
static void
acc (struct statistic *s, const struct ccase *cx UNUSED, double c, double cc, double y)
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 statistic *stat = &os->parent;
os->n_k = 2;
- os->k = xcalloc (sizeof (*os->k), 2);
+ os->k = xcalloc (2, sizeof (*os->k));
assert (tail >= 0);
assert (tail <= 1);
{
const struct order_stats *os = (const struct order_stats *) tm;
- assert (os->cc == tm->w);
-
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->w - os->k[1].cc - os->k[0].tc) * os->k[1].y_p1
+
- tm->sum
- -
- tm->cyk1p1
+ tm->sum
)
- /
- ( (1.0 - 2 * tm->tail) * tm->w);
+ / ((1.0 - tm->tail * 2) * tm->w);
}