X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fmath%2Fmoments.c;h=517219d54fcf5d3cc159b4b64c8f6454f64a5bd4;hb=b525a9596e60d5ae4c6c464b4a426b77ade3dd72;hp=c00d63650cb4540113caba2db52561b2da49237c;hpb=89c05dfe33f9542e60e66dd383f7a514849b5947;p=pspp diff --git a/src/math/moments.c b/src/math/moments.c index c00d63650c..517219d54f 100644 --- a/src/math/moments.c +++ b/src/math/moments.c @@ -244,14 +244,14 @@ moments_destroy (struct moments *m) free (m); } -/* Calculates the requested moments on the CNT values in ARRAY. +/* Calculates the requested moments on the N values in ARRAY. Each value is given a weight of 1. The total weight is stored into *WEIGHT (trivially) and the mean, variance, skewness, and kurtosis are stored into *MEAN, *VARIANCE, *SKEWNESS, and *KURTOSIS, respectively. Any of the result pointers may be null, in which case no value is stored. */ void -moments_of_doubles (const double *array, size_t cnt, +moments_of_doubles (const double *array, size_t n, double *weight, double *mean, double *variance, double *skewness, double *kurtosis) @@ -270,21 +270,21 @@ moments_of_doubles (const double *array, size_t cnt, max_moment = MOMENT_MEAN; init_moments (&m, max_moment); - for (idx = 0; idx < cnt; idx++) + for (idx = 0; idx < n; idx++) moments_pass_one (&m, array[idx], 1.); - for (idx = 0; idx < cnt; idx++) + for (idx = 0; idx < n; idx++) moments_pass_two (&m, array[idx], 1.); moments_calculate (&m, weight, mean, variance, skewness, kurtosis); } -/* Calculates the requested moments on the CNT numeric values in +/* Calculates the requested moments on the N numeric values in ARRAY. Each value is given a weight of 1. The total weight is stored into *WEIGHT (trivially) and the mean, variance, skewness, and kurtosis are stored into *MEAN, *VARIANCE, *SKEWNESS, and *KURTOSIS, respectively. Any of the result pointers may be null, in which case no value is stored. */ void -moments_of_values (const union value *array, size_t cnt, +moments_of_values (const union value *array, size_t n, double *weight, double *mean, double *variance, double *skewness, double *kurtosis) @@ -303,9 +303,9 @@ moments_of_values (const union value *array, size_t cnt, max_moment = MOMENT_MEAN; init_moments (&m, max_moment); - for (idx = 0; idx < cnt; idx++) + for (idx = 0; idx < n; idx++) moments_pass_one (&m, array[idx].f, 1.); - for (idx = 0; idx < cnt; idx++) + for (idx = 0; idx < n; idx++) moments_pass_two (&m, array[idx].f, 1.); moments_calculate (&m, weight, mean, variance, skewness, kurtosis); }