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

[pspp] / src / math / moments.h

diff --git a/src/math/moments.h b/src/math/moments.h
index d872280131f5245b710bd1d264971f9cd921f265..79a95f8d6321e94c3f3c1eaf7346b08eb82a69a5 100644 (file)
--- a/src/math/moments.h
+++ b/src/math/moments.h
@@ -1,31 +1,28 @@
-/* PSPP - computes sample statistics.
-   Copyright (C) 2004 Free Software Foundation, Inc.
-   Written by Ben Pfaff <blp@gnu.org>.
+/* PSPP - a program for statistical analysis.
+   Copyright (C) 2004, 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 the Free Software Foundation; either version 2 of the
-   License, or (at your option) any later version.
+   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
+   the Free Software Foundation, either version 3 of the License, or
+   (at your option) any later version.
 
-   This program is distributed in the hope that it will be useful, but
-   WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   General Public License for more details.
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-   02110-1301, USA. */
+   along with this program.  If not, see <http://www.gnu.org/licenses/>. */
 
 #ifndef HEADER_MOMENTS
 #define HEADER_MOMENTS
 
 #include <stddef.h>
-#include "value.h"
+#include "data/value.h"
 
 /* Moments of the mean.
    Higher-order moments have higher values. */
-enum moment 
+enum moment
   {
     MOMENT_NONE,                /* No moments. */
     MOMENT_MEAN,                /* First-order moment. */
@@ -68,7 +65,7 @@ void moments1_calculate (const struct moments1 *,
 void moments1_destroy (struct moments1 *);
 
 /* Standard errors. */
-double calc_semean (double stddev, double weight);
+double calc_semean (double variance, double weight);
 double calc_seskew (double weight);
 double calc_sekurt (double weight);