diff --git a/main.cpp b/main.cpp index 45e8546..473cf83 100644 --- a/main.cpp +++ b/main.cpp @@ -5,20 +5,22 @@ using namespace std; struct Input { vector numbers; size_t bin_count{}; + }; Input input_data(){ + size_t number_count; + cin >> number_count; + Input in; -size_t number_count; -cin >> number_count; -in.numbers.resize(number_count); - for (size_t i = 0; i < number_count; i++) { - cin >> in.numbers[i]; - } -cin >> in.bin_count; + in.numbers.resize(number_count); + for (size_t i = 0; i < number_count; i++) { + cin >> in.numbers[i]; + } + cin >> in.bin_count; return in; } - void find_minmax(vector numbers, double min, double max) { + void find_minmax(vector numbers, double& min, double& max) { min = numbers[0]; max = numbers[0]; for (double x : numbers) { @@ -34,24 +36,27 @@ return in; int main() { Input in = input_data(); - double bin_size = (max - min) / bin_count; - vector bins(bin_count); - for (size_t i = 0; i < number_count; i++) { + double max,min; + find_minmax(in.numbers,min,max); + double bin_size = (max - min) / in.bin_count; + vector bins(in.bin_count); + for(double x:in.numbers) + { bool found = false; - for (size_t j = 0; (j < bin_count - 1) && !found; j++) { + for (size_t j = 0; (j < in.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)) { + if ((lo <= x) && (x < hi)) { bins[j]++; found = true; } } if (!found) - bins[bin_count-1]++; + bins[in.bin_count-1]++; } - for(size_t i=0;i