X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fmath%2Ftrimmed-mean.c;h=b985125295f9754d1ffec7c6b751c02e08425516;hb=478954c1ed028744ab870f0e6a5befcc8f643758;hp=d1cc6b708279098ab8d263b95923d9b31c968ed6;hpb=cb586666724d5fcbdb658ce471b85484f0a7babe;p=pspp diff --git a/src/math/trimmed-mean.c b/src/math/trimmed-mean.c index d1cc6b7082..b985125295 100644 --- a/src/math/trimmed-mean.c +++ b/src/math/trimmed-mean.c @@ -1,5 +1,5 @@ /* 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 @@ -15,15 +15,17 @@ along with this program. If not, see . */ #include -#include "trimmed-mean.h" -#include -#include -#include -#include +#include "math/trimmed-mean.h" + #include -#include +#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) @@ -55,7 +57,7 @@ trimmed_mean_create (double W, double tail) 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);