projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Avoid deprecation warnings by use of gtk2 -> gtk3 wrapper macros.
[pspp]
/
src
/
math
/
moments.c
diff --git
a/src/math/moments.c
b/src/math/moments.c
index 02208bca70d007d1bc9f61f07d518b9b985a621d..40180f7b7ecdb461c46eaa31b42c1927835c7b66 100644
(file)
--- a/
src/math/moments.c
+++ b/
src/math/moments.c
@@
-1,5
+1,5
@@
/* PSPP - a program for statistical analysis.
/* PSPP - a program for statistical analysis.
- Copyright (C) 1997-9, 2000 Free Software Foundation, Inc.
+ Copyright (C) 1997-9, 2000
, 2010, 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,16
+15,18
@@
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 "moments.h"
+
+#include "math/moments.h"
+
#include <assert.h>
#include <assert.h>
-#include <gsl/gsl_math.h>
#include <math.h>
#include <stdlib.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/val-type.h"
+#include "data/value.h"
+#include "libpspp/misc.h"
+
+#include "gl/xalloc.h"
#include "gettext.h"
#define _(msgid) gettext (msgid)
#include "gettext.h"
#define _(msgid) gettext (msgid)
@@
-50,13
+52,13
@@
calc_moments (enum moment max_moment,
/* From _SPSS Statistical Algorithms, 2nd ed.,
0-918469-89-9, section "DESCRIPTIVES". */
/* From _SPSS Statistical Algorithms, 2nd ed.,
0-918469-89-9, section "DESCRIPTIVES". */
- if (fabs (
*variance
) >= 1e-20)
+ if (fabs (
s2
) >= 1e-20)
{
if (max_moment >= MOMENT_SKEWNESS && skewness != NULL && w > 2.)
{
double s3 = s2 * sqrt (s2);
double g1 = (w * d3) / ((w - 1.0) * (w - 2.0) * s3);
{
if (max_moment >= MOMENT_SKEWNESS && skewness != NULL && w > 2.)
{
double s3 = s2 * sqrt (s2);
double g1 = (w * d3) / ((w - 1.0) * (w - 2.0) * s3);
- if (
gsl_
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.)
@@
-64,7
+66,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 (
gsl_
finite (g2))
+ if (
is
finite (g2))
*kurtosis = g2;
}
}
*kurtosis = g2;
}
}
@@
-223,12
+225,8
@@
moments_calculate (const struct moments *m,
}
else
{
}
else
{
- /* After the second pass we can calculate any stat. We
- don't support "online" computation during the second
- pass, so As a simple self-check, the total weight for
- the passes must agree. */
+ /* After the second pass we can calculate any stat. */
assert (m->pass == 2);
assert (m->pass == 2);
- assert (m->w1 == m->w2);
if (m->w2 > 0.)
{
if (m->w2 > 0.)
{
@@
-459,6
+457,13
@@
moments1_destroy (struct moments1 *m)
free (m);
}
\f
free (m);
}
\f
+
+double
+calc_semean (double var, double W)
+{
+ return sqrt (var / W);
+}
+
/* Returns the standard error of the skewness for the given total
weight W.
/* Returns the standard error of the skewness for the given total
weight W.