X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=src%2Fmath%2Fhistogram.c;h=67079398d169ec58737c6f3b94a7d243b9fc8516;hb=97e2b765b9b3cb25c85c5a6b0727d66e481411b1;hp=8c809093335d68a1aad52f0cb3f91e0400508864;hpb=f5c108becd49d78f4898cab11352291f5689d24e;p=pspp
diff --git a/src/math/histogram.c b/src/math/histogram.c
index 8c80909333..67079398d1 100644
--- a/src/math/histogram.c
+++ b/src/math/histogram.c
@@ -1,52 +1,83 @@
-/* PSPP - computes sample statistics.
- Copyright (C) 2004 Free Software Foundation, Inc.
+/* PSPP - a program for statistical analysis.
+ Copyright (C) 2004, 2008 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 . */
#include
-#include
-#include
-#include
#include "histogram.h"
+
+#include
+#include
+
+#include
#include "chart-geometry.h"
+#include
+
+
+void
+histogram_add (struct histogram *h, double y, double c)
+{
+ ((struct statistic *)h)->accumulate ((struct statistic *) h, NULL, c, 0, y);
+}
+
-gsl_histogram *
-histogram_create(double bins, double x_min, double x_max)
+static void
+acc (struct statistic *s, const struct ccase *cx UNUSED, double c, double cc UNUSED, double y)
{
- int n;
- double bin_width ;
- double bin_width_2 ;
+ struct histogram *hist = (struct histogram *) s;
+
+ gsl_histogram_accumulate (hist->gsl_hist, y, c);
+}
+
+
+static void
+destroy (struct statistic *s)
+{
+ struct histogram *h = (struct histogram *) s;
+ gsl_histogram_free (h->gsl_hist);
+ free (s);
+}
+
+
+struct statistic *
+histogram_create (int bins, double min, double max)
+{
+ struct histogram *h = xmalloc (sizeof *h);
+ struct statistic *stat = (struct statistic *) h;
double upper_limit, lower_limit;
- gsl_histogram *hist = gsl_histogram_alloc(bins);
+ double bin_width = chart_rounded_tick ((max - min) / (double) bins);
+ double bin_width_2 = bin_width / 2.0;
- bin_width = chart_rounded_tick((x_max - x_min)/ bins);
- bin_width_2 = bin_width / 2.0;
+ int n = ceil (max / (bin_width_2) ) ;
+
+ assert (max > min);
- n = ceil( x_max / (bin_width_2) ) ;
if ( ! (n % 2 ) ) n++;
upper_limit = n * bin_width_2;
- n = floor( x_min / (bin_width_2) ) ;
+ n = floor (min / (bin_width_2) ) ;
if ( ! (n % 2 ) ) n--;
lower_limit = n * bin_width_2;
- gsl_histogram_set_ranges_uniform(hist, lower_limit, upper_limit);
+ h->gsl_hist = gsl_histogram_alloc (bins);
+ gsl_histogram_set_ranges_uniform (h->gsl_hist, lower_limit, upper_limit);
+
+ stat->accumulate = acc;
+ stat->destroy = destroy;
- return hist;
+ return stat;
}