projects
/
pspp-builds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add CONST_CAST macro, for casting away "const" more safely.
[pspp-builds.git]
/
src
/
math
/
moments.c
diff --git
a/src/math/moments.c
b/src/math/moments.c
index a5be12e9cd0d53a108cd91ea98b3d85bd6daf4f3..d129f6ab038b3eee06104e716b15fbcf432c61c5 100644
(file)
--- a/
src/math/moments.c
+++ b/
src/math/moments.c
@@
-20,6
+20,7
@@
#include <math.h>
#include <stdlib.h>
#include <libpspp/misc.h>
#include <math.h>
#include <stdlib.h>
#include <libpspp/misc.h>
+#include <data/val-type.h>
#include <data/value.h>
#include "xalloc.h"
#include <data/value.h>
#include "xalloc.h"
@@
-54,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.)
@@
-62,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;
}
}