moments: Spell out "variance" ("var" is easily confused with "variable").

[pspp] / src / math / moments.c

diff --git a/src/math/moments.c b/src/math/moments.c
index e289e8aec0ef27c2372e2c007eeb30e6b2f6d469..c00d63650cb4540113caba2db52561b2da49237c 100644 (file)
--- a/src/math/moments.c
+++ b/src/math/moments.c
@@ -28,8 +28,6 @@
 
 #include "gl/xalloc.h"
 
-#include "gettext.h"
-#define _(msgid) gettext (msgid)
 \f
 /* Calculates variance, skewness, and kurtosis into *VARIANCE,
    *SKEWNESS, and *KURTOSIS if they are non-null and not greater
@@ -225,12 +223,8 @@ moments_calculate (const struct moments *m,
     }
   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->w1 == m->w2);
 
       if (m->w2 > 0.)
         {
@@ -461,6 +455,13 @@ moments1_destroy (struct moments1 *m)
   free (m);
 }
 \f
+
+double
+calc_semean (double variance, double W)
+{
+  return sqrt (variance / W);
+}
+
 /* Returns the standard error of the skewness for the given total
    weight W.