diff --git a/main.cpp b/main.cpp index 7d919de..846440e 100644 --- a/main.cpp +++ b/main.cpp @@ -11,26 +11,26 @@ struct Input { size_t bin_count{}; }; -Input input_data() { +Input input_data(istream& in) { size_t number_count; cerr << "Введите кол-во чисел в строке: "; - cin >> number_count; - Input in; - in.numbers.resize(number_count); + in >> number_count; + Input input; + input.numbers.resize(number_count); cerr << "Введите строку чисел: "; for (int i = 0; i < number_count; i++) { - cin >> in.numbers[i]; + in >> input.numbers[i]; } cerr << "Введите кол-во корзин: "; - cin >> in.bin_count; - return in; + in >> input.bin_count; + return input; } int main () { - auto in = input_data(); + auto in = input_data(cin); auto bins = make_histogram(in.numbers, in.bin_count); show_histogram_svg(bins); return 0;