projects
/
pspp-builds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Implemented the sign test.
[pspp-builds.git]
/
src
/
math
/
moments.c
diff --git
a/src/math/moments.c
b/src/math/moments.c
index 2934dd7ad5a547807b7395af925def288f83cb28..d129f6ab038b3eee06104e716b15fbcf432c61c5 100644
(file)
--- a/
src/math/moments.c
+++ b/
src/math/moments.c
@@
-19,10
+19,12
@@
#include <assert.h>
#include <math.h>
#include <stdlib.h>
#include <assert.h>
#include <math.h>
#include <stdlib.h>
-#include <libpspp/alloc.h>
#include <libpspp/misc.h>
#include <libpspp/misc.h>
+#include <data/val-type.h>
#include <data/value.h>
#include <data/value.h>
+#include "xalloc.h"
+
#include "gettext.h"
#define _(msgid) gettext (msgid)
\f
#include "gettext.h"
#define _(msgid) gettext (msgid)
\f
@@
-53,7
+55,7
@@
calc_moments (enum moment max_moment,
{
double s3 = s2 * sqrt (s2);
double g1 = (w * d3) / ((w - 1.0) * (w - 2.0) * s3);
{
double s3 = s2 * sqrt (s2);
double g1 = (w * d3) / ((w - 1.0) * (w - 2.0) * s3);
- if (finite (g1))
+ if (
is
finite (g1))
*skewness = g1;
}
if (max_moment >= MOMENT_KURTOSIS && kurtosis != NULL && w > 3.)
*skewness = g1;
}
if (max_moment >= MOMENT_KURTOSIS && kurtosis != NULL && w > 3.)
@@
-61,7
+63,7
@@
calc_moments (enum moment max_moment,
double den = (w - 2.) * (w - 3.) * pow2 (s2);
double g2 = (w * (w + 1) * d4 / (w - 1.) / den
- 3. * pow2 (d2) / den);
double den = (w - 2.) * (w - 3.) * pow2 (s2);
double g2 = (w * (w + 1) * d4 / (w - 1.) / den
- 3. * pow2 (d2) / den);
- if (finite (g2))
+ if (
is
finite (g2))
*kurtosis = g2;
}
}
*kurtosis = g2;
}
}