X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fmath%2Ftrimmed-mean.c;h=2d44d0dc08cc3bba114f4ed9004c17eaf9ae6a7f;hb=refs%2Fbuilds%2F20130109032153%2Fpspp;hp=d1cc6b708279098ab8d263b95923d9b31c968ed6;hpb=cb72db62c20ecab427229110820c5b053d0663c4;p=pspp

diff --git a/src/math/trimmed-mean.c b/src/math/trimmed-mean.c
index d1cc6b7082..2d44d0dc08 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 <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)
@@ -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);
@@ -79,8 +81,6 @@ trimmed_mean_calculate (const struct trimmed_mean *tm)
 {
   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