projects
/
pspp-builds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Update all #include directives to the currently preferred style.
[pspp-builds.git]
/
src
/
math
/
trimmed-mean.c
diff --git
a/src/math/trimmed-mean.c
b/src/math/trimmed-mean.c
index da3d4240e5b232533de6c5c31073b53adda49f48..5e48689626817ddf59ad46363a17e1d0e763084d 100644
(file)
--- a/
src/math/trimmed-mean.c
+++ b/
src/math/trimmed-mean.c
@@
-1,5
+1,5
@@
/* PSPP - a program for statistical analysis.
/* PSPP - a program for statistical analysis.
- Copyright (C) 2008 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
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,20
+15,23
@@
along with this program. If not, see <http://www.gnu.org/licenses/>. */
#include <config.h>
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
"math/trimmed-mean.h"
+
#include <math.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)
{
static void
acc (struct statistic *s, const struct ccase *cx UNUSED, double c, double cc, double y)
{
- struct trimmed_mean *tm =
(struct trimmed_mean *) s
;
- struct order_stats *os =
(struct order_stats *) s
;
+ 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;
@@
-40,17
+43,18
@@
acc (struct statistic *s, const struct ccase *cx UNUSED, double c, double cc, do
static void
destroy (struct statistic *s)
{
static void
destroy (struct statistic *s)
{
- struct order_stats *os = (struct order_stats *) s;
+ struct trimmed_mean *tm = UP_CAST (s, struct trimmed_mean, parent.parent);
+ struct order_stats *os = &tm->parent;
free (os->k);
free (os->k);
- free (
s
);
+ free (
tm
);
}
}
-struct
statistic
*
+struct
trimmed_mean
*
trimmed_mean_create (double W, double tail)
{
struct trimmed_mean *tm = xzalloc (sizeof (*tm));
trimmed_mean_create (double W, double tail)
{
struct trimmed_mean *tm = xzalloc (sizeof (*tm));
- struct order_stats *os =
(struct order_stats *) tm
;
- struct statistic *stat =
(struct statistic *) tm
;
+ struct order_stats *os =
&tm->parent
;
+ struct statistic *stat =
&os->parent
;
os->n_k = 2;
os->k = xcalloc (sizeof (*os->k), 2);
os->n_k = 2;
os->k = xcalloc (sizeof (*os->k), 2);
@@
-68,7
+72,7
@@
trimmed_mean_create (double W, double tail)
tm->w = W;
tm->tail = tail;
tm->w = W;
tm->tail = tail;
- return
stat
;
+ return
tm
;
}
}