diff --git a/histogram.cpp b/histogram.cpp index e69de29..5867495 100644 --- a/histogram.cpp +++ b/histogram.cpp @@ -0,0 +1,54 @@ +#include "histogram.h" +#include +#include +using namespace std; + +void find_minmax(const vector &numbers, double &min, double &max) +{ + min = numbers[0]; + max = numbers[0]; + for (double x : numbers) + { + if (x < min) + { + min = x; + } + else if (x > max) + { + max = x; + } + } + return; +} + +vector make_histogram (vector numbers, size_t bin_count) +{ + + double min; + double max; + find_minmax (numbers, min, max); + double bin_size = (max - min) / bin_count; + vector bins(bin_count); + + for (size_t i = 0; i < numbers.size(); i++) + { + bool found = false; + for (size_t j = 0; (j < bin_count - 1) && !found; j++) + { + auto lo = min + j * bin_size; + auto hi = min + (j + 1) * bin_size; + if ((lo <= numbers[i]) && (numbers[i] < hi)) + { + bins[j]++; + found = true; + } + } + + if (!found) + { + bins[bin_count - 1]++; + } + } + + return bins; +} diff --git a/histogram.h b/histogram.h index 46e5088..c750551 100644 --- a/histogram.h +++ b/histogram.h @@ -1,6 +1,6 @@ #ifndef HISTOGRAM_H_INCLUDED #define HISTOGRAM_H_INCLUDED - - - +#include +std::vector +make_histogram(const std::vector numbers, size_t bin_count); #endif // HISTOGRAM_H_INCLUDED