X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fmath%2Fmoments.h;h=553fba62ba4d66bb4b82499cf1c56aa08db8f9a9;hb=b525a9596e60d5ae4c6c464b4a426b77ade3dd72;hp=e36e58aaead804ccfc86a79c0dc9f5114ad6ceaa;hpb=f5c108becd49d78f4898cab11352291f5689d24e;p=pspp
diff --git a/src/math/moments.h b/src/math/moments.h
index e36e58aaea..553fba62ba 100644
--- a/src/math/moments.h
+++ b/src/math/moments.h
@@ -1,26 +1,24 @@
-/* PSPP - computes sample statistics.
- Copyright (C) 2004 Free Software Foundation, Inc.
+/* 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 . */
#ifndef HEADER_MOMENTS
#define HEADER_MOMENTS
#include
-#include
+#include "data/value.h"
/* Moments of the mean.
Higher-order moments have higher values. */
@@ -47,11 +45,11 @@ void moments_calculate (const struct moments *,
void moments_destroy (struct moments *);
/* Convenience functions for two-pass moments. */
-void moments_of_doubles (const double *array, size_t cnt,
+void moments_of_doubles (const double *array, size_t n,
double *weight,
double *mean, double *variance,
double *skewness, double *kurtosis);
-void moments_of_values (const union value *array, size_t cnt,
+void moments_of_values (const union value *array, size_t n,
double *weight,
double *mean, double *variance,
double *skewness, double *kurtosis);
@@ -67,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);