X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fmath%2Fhistogram.c;h=1b55d204b866fa2e15dc4ff3f84d3b3a509a9915;hb=81579d9e9f994fb2908f50af41c3eb033d216e58;hp=7b875d4089ad211d39a636f34fa8e8108a2098de;hpb=43b1296aafe7582e7dbe6c2b6a8b478d7d9b0fcf;p=pspp-builds.git
diff --git a/src/math/histogram.c b/src/math/histogram.c
index 7b875d40..1b55d204 100644
--- a/src/math/histogram.c
+++ b/src/math/histogram.c
@@ -1,5 +1,5 @@
/* PSPP - a program for statistical analysis.
- Copyright (C) 2004 Free Software Foundation, Inc.
+ Copyright (C) 2004, 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
@@ -15,36 +15,72 @@
along with this program. If not, see . */
#include
-#include
+
+#include "math/histogram.h"
+
#include
-#include
-#include "histogram.h"
-#include "chart-geometry.h"
+#include
+
+#include "libpspp/assertion.h"
+#include "libpspp/cast.h"
+#include "math/chart-geometry.h"
+#include "gl/xalloc.h"
-gsl_histogram *
-histogram_create(double bins, double x_min, double x_max)
+void
+histogram_add (struct histogram *h, double y, double c)
{
- int n;
- double bin_width ;
- double bin_width_2 ;
+ struct statistic *stat = &h->parent;
+ stat->accumulate (stat, NULL, c, 0, y);
+}
+
+
+
+static void
+acc (struct statistic *s, const struct ccase *cx UNUSED, double c, double cc UNUSED, double y)
+{
+ struct histogram *hist = UP_CAST (s, struct histogram, parent);
+
+ gsl_histogram_accumulate (hist->gsl_hist, y, c);
+}
+
+
+static void
+destroy (struct statistic *s)
+{
+ struct histogram *h = UP_CAST (s, struct histogram, parent);
+ gsl_histogram_free (h->gsl_hist);
+ free (s);
+}
+
+
+struct histogram *
+histogram_create (int bins, double min, double max)
+{
+ struct histogram *h = xmalloc (sizeof *h);
+ struct statistic *stat = &h->parent;
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 h;
}