X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fmath%2Fmoments.c;h=83cbbe4ca1fb3e4c2d4e2a6497ed84ced68b0c31;hb=8f843c3a5e905c7f233d436b684a7d8fd958bd6c;hp=02208bca70d007d1bc9f61f07d518b9b985a621d;hpb=a9afcdd223cc1c1b7889601e405cff0bd47300d7;p=pspp

diff --git a/src/math/moments.c b/src/math/moments.c
index 02208bca70..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,16 +15,18 @@
    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 <gsl/gsl_math.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)
@@ -50,13 +52,13 @@ 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.)
             {
               double s3 = s2 * sqrt (s2);
               double g1 = (w * d3) / ((w - 1.0) * (w - 2.0) * s3);
-              if (gsl_finite (g1))
+              if (isfinite (g1))
                 *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);
-              if (gsl_finite (g2))
+              if (isfinite (g2))
                 *kurtosis = g2;
             }
         }
@@ -459,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.