diff --git a/l03.cpp b/l03.cpp index c9871d9..8794733 100644 --- a/l03.cpp +++ b/l03.cpp @@ -37,7 +37,6 @@ Input input_data() return in; } -using namespace std; void find_minmax(const vector &numbers, double &min, double &max) { @@ -57,6 +56,46 @@ void find_minmax(const vector &numbers, double &min, double &max) } } +int make_histogram(const vector &numbers, size_t &bin_count) +{ + vector bins(bin_count); + int max_count = bins[0]; + double min = numbers[0]; + double max = numbers[0]; + + find_minmax(numbers, min, max); + double bin_size = (max - min) / 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]++; + } + } + for (int i = 0; i < bin_count; i++) + { + if (bins[i] > max_count) + { + max_count = bins[i]; + } + } + return bins; +} + int main() { Input in = input_data();