X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;ds=inline;f=src%2Fmath%2Fhistogram.h;h=89d4f5e869e7e5a69c767c33546942c811131ab8;hb=2f3f4d9b20e0cde593fad4137cdc48922a38c3da;hp=5bfa6c411bbe1c39b12b43af6fcd5e4dc625a273;hpb=164d1274fcb70c54897f2a03fc7c27152ed4821a;p=pspp
diff --git a/src/math/histogram.h b/src/math/histogram.h
index 5bfa6c411b..89d4f5e869 100644
--- a/src/math/histogram.h
+++ b/src/math/histogram.h
@@ -1,26 +1,44 @@
-/* PSPP - computes sample statistics.
- Copyright (C) 2004 Free Software Foundation, Inc.
+/* PSPP - a program for statistical analysis.
+ Copyright (C) 2008, 2009, 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 HISTOGRAM_H
-#define HISTOGRAM_H
+#ifndef __HISTOGRAM_H__
+#define __HISTOGRAM_H__
+
+#include
+
+#include "math/statistic.h"
#include
-gsl_histogram * histogram_create(double bins, double x_min, double x_max);
+
+struct histogram
+{
+ struct statistic parent;
+ gsl_histogram *gsl_hist;
+};
+
+/*
+ Prepare a histogram for data which lies in the range [min, max)
+ bin_width is a nominal figure only. It is a hint about what might be
+ an good approximate bin width, but the implementation will adjust it
+ as it thinks fit.
+ */
+struct histogram * histogram_create (double bin_width, double min, double max);
+
+void histogram_add (struct histogram *h, double y, double c);
+
#endif