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
/
tukey-hinges.c
diff --git
a/src/math/tukey-hinges.c
b/src/math/tukey-hinges.c
index 95a79c1d30026da280cbc6fa2542518c0ff4ad1f..3e9ea9374eb4198b76d83688234b23de97fc7cf9 100644
(file)
--- a/
src/math/tukey-hinges.c
+++ b/
src/math/tukey-hinges.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,13
+15,17
@@
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 "tukey-hinges.h"
-#include <math/order-stats.h>
-#include
<gl/xalloc.h>
-#include <libpspp/assertion.h>
+#include
"math/tukey-hinges.h"
+
#include <math.h>
#include <math.h>
+#include "libpspp/assertion.h"
+#include "libpspp/cast.h"
+#include "math/order-stats.h"
+
+#include "gl/xalloc.h"
+
void
tukey_hinges_calculate (const struct tukey_hinges *th, double hinge[3])
{
void
tukey_hinges_calculate (const struct tukey_hinges *th, double hinge[3])
{
@@
-59,19
+63,20
@@
tukey_hinges_calculate (const struct tukey_hinges *th, double hinge[3])
static void
destroy (struct statistic *s)
{
static void
destroy (struct statistic *s)
{
- struct order_stats *os = (struct order_stats *) s;
+ struct tukey_hinges *th = UP_CAST (s, struct tukey_hinges, parent.parent);
+ struct order_stats *os = &th->parent;
free (os->k);
free (s);
};
free (os->k);
free (s);
};
-struct
statistic
*
+struct
tukey_hinges
*
tukey_hinges_create (double W, double c_min)
{
double d;
struct tukey_hinges *th = xzalloc (sizeof (*th));
tukey_hinges_create (double W, double c_min)
{
double d;
struct tukey_hinges *th = xzalloc (sizeof (*th));
- struct order_stats *os =
(struct order_stats *) th
;
- struct statistic *stat =
(struct statistic *) th
;
+ struct order_stats *os =
&th->parent
;
+ struct statistic *stat =
&os->parent
;
assert (c_min >= 0);
assert (c_min >= 0);
@@
-97,5
+102,5
@@
tukey_hinges_create (double W, double c_min)
stat->destroy = destroy;
stat->destroy = destroy;
- return
stat
;
+ return
th
;
}
}