projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
macro: Fix memory leak with keyword "enclose" arguments.
[pspp]
/
src
/
math
/
tukey-hinges.c
diff --git
a/src/math/tukey-hinges.c
b/src/math/tukey-hinges.c
index 22ab45210c38c98066eb4bb654663114cb496ddd..aaf4881afa954e79e2a9b731188572072df1b558 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, 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
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,14
+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 <libpspp/cast.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])
{
@@
-38,7
+41,7
@@
tukey_hinges_calculate (const struct tukey_hinges *th, double hinge[3])
if (a_star[i] < 1)
{
if (a_star[i] < 1)
{
- if (os->k[i].c_p1 >= 1
)
+ if (os->k[i].c_p1 >= 1)
{
hinge[i] = (1 - a_star[i]) * os->k[i].y
+ a_star[i] * os->k[i].y_p1;
{
hinge[i] = (1 - a_star[i]) * os->k[i].y
+ a_star[i] * os->k[i].y_p1;
@@
-71,16
+74,16
@@
struct tukey_hinges *
tukey_hinges_create (double W, double c_min)
{
double d;
tukey_hinges_create (double W, double c_min)
{
double d;
- struct tukey_hinges *th =
xzalloc (sizeof (*th)
);
+ struct tukey_hinges *th =
XZALLOC (struct tukey_hinges
);
struct order_stats *os = &th->parent;
struct statistic *stat = &os->parent;
assert (c_min >= 0);
os->n_k = 3;
struct order_stats *os = &th->parent;
struct statistic *stat = &os->parent;
assert (c_min >= 0);
os->n_k = 3;
- os->k = xcalloc (
sizeof (*os->k), 3
);
+ os->k = xcalloc (
3, sizeof (*os->k)
);
- if (
c_min >= 1.0)
+ if (c_min >= 1.0)
{
d = floor ((W + 3) / 2.0) / 2.0;
{
d = floor ((W + 3) / 2.0) / 2.0;