X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fmath%2Fmoments.h;h=8bf916592e759879a849020a18b20534cc394387;hb=f0168bf82cd65cb3af7f0816dc64af06dc17636d;hp=c43f9ca492a8d17d3db8ee45943781581b13e810;hpb=480a0746507ce73d26f528b56dc3ed80195096e0;p=pspp diff --git a/src/math/moments.h b/src/math/moments.h index c43f9ca492..8bf916592e 100644 --- a/src/math/moments.h +++ b/src/math/moments.h @@ -1,30 +1,28 @@ -/* 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. */ -enum moment +enum moment { MOMENT_NONE, /* No moments. */ MOMENT_MEAN, /* First-order moment. */ @@ -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 var, double weight); double calc_seskew (double weight); double calc_sekurt (double weight);