diff --git a/main.cpp b/main.cpp index b29e26c..d30cb11 100644 --- a/main.cpp +++ b/main.cpp @@ -6,7 +6,7 @@ using namespace std; struct Input { vector numbers; - size_t bin_count{}; + int bin_count{}; }; Input @@ -18,7 +18,7 @@ input_data(){ for (size_t i = 0; i < number_count; i++) { cin >> in.numbers[i]; } - size_t bin_count; + int bin_count; cin >> in.bin_count; return in; } @@ -41,35 +41,21 @@ find_minmax(const std::vector &numbers, double &min, double &max){ } -int -main() -{ - - const size_t SCREEN_WIDTH = 80; - const size_t MAX_ASTERISK = SCREEN_WIDTH - 3 - 1; - Input in = input_data(); - vector bins(in.bin_count); - - +std::vector +make_histogram(std::vector numbers, size_t bin_count){ double min; double max; - find_minmax(in.numbers, min, max); - - size_t max_count; - for (int i =0; imax_count){ - max_count=in.numbers[i]; - } - } - double bin_size = (max - min) / in.bin_count; - for (size_t i = 0; i < in.numbers.size(); i++) + vector bins(bin_count); + 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 < in.bin_count - 1) && !found; j++) + 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 <= in.numbers[i]) && (in.numbers[i] < hi)) + if ((lo <= numbers[i]) && (numbers[i] < hi)) { bins[j]++; found = true; @@ -78,9 +64,32 @@ main() } if (!found) { - bins[in.bin_count - 1]++; + bins[bin_count - 1]++; } } + return bins; +} + +int +main() +{ + + const size_t SCREEN_WIDTH = 80; + const size_t MAX_ASTERISK = SCREEN_WIDTH - 3 - 1; + auto in = input_data(); + auto bins = make_histogram(in.numbers, in.bin_count); + + double min; + double max; + find_minmax(in.numbers, min, max); + + size_t max_count; + for (int i =0; imax_count){ + max_count=in.numbers[i]; + } + } + for (int i =0; imax_count){ @@ -145,7 +154,6 @@ main() for (int i =0; i< in.bin_count;i++){ cout<