void
histogram_add (struct histogram *h, double y, double c)
{
- 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 *gslh = hist->gsl_hist;
-
- /* Include cases which are just on the boundary */
- if (y == gsl_histogram_max (gslh))
- {
- double lower, upper;
- gsl_histogram_get_range (gslh, gsl_histogram_bins (gslh)-1, &lower, &upper);
- gsl_histogram_accumulate (gslh, lower + (upper - lower)/2.0, c);
- }
- else
- gsl_histogram_accumulate (hist->gsl_hist, y, c);
+ gsl_histogram_accumulate (h->gsl_hist, y, c);
}
static void
nbins = ceil((max-*adjusted_min)/binwidth);
*adjusted_max = nbins*binwidth + *adjusted_min;
+ /* adjusted_max should never be smaller than max but if it is equal
+ then the gsl_histogram will not add the cases which have max value */
+ if (*adjusted_max <= max)
+ {
+ *adjusted_max += binwidth;
+ nbins++;
+ }
+ assert (*adjusted_min <= min);
+
return nbins;
}
}
stat = &h->parent;
- stat->accumulate = acc;
stat->destroy = destroy;
return h;