X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fmath%2Fmoments.c;h=83cbbe4ca1fb3e4c2d4e2a6497ed84ced68b0c31;hb=811c669032a18cfff53291a98e5803afdf39db36;hp=d129f6ab038b3eee06104e716b15fbcf432c61c5;hpb=c3ac5a8af9c449072c7e872ca70a78c1755ae309;p=pspp diff --git a/src/math/moments.c b/src/math/moments.c index d129f6ab03..83cbbe4ca1 100644 --- a/src/math/moments.c +++ b/src/math/moments.c @@ -1,5 +1,5 @@ /* 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 @@ -15,15 +15,18 @@ along with this program. If not, see . */ #include -#include "moments.h" + +#include "math/moments.h" + #include #include #include -#include -#include -#include -#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) @@ -49,7 +52,7 @@ calc_moments (enum moment max_moment, /* 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.) { @@ -458,6 +461,13 @@ moments1_destroy (struct moments1 *m) free (m); } + +double +calc_semean (double var, double W) +{ + return sqrt (var / W); +} + /* Returns the standard error of the skewness for the given total weight W.