diff --git a/main.cpp b/main.cpp index 77ae553..dc94d2a 100644 --- a/main.cpp +++ b/main.cpp @@ -12,26 +12,26 @@ struct Input { size_t bin_count{}; }; Input -input_data(){ - size_t number_count, bin_count; +input_data(istream& in){ + size_t number_count; cerr << "Enter number count: "; cin >> number_count; //Кол-во чисел - Input in; - in.numbers.resize(number_count); + Input inp; + inp.numbers.resize(number_count); for (size_t i = 0; i < number_count; i++) { cerr << "Enter Num[" << i << "]: "; - cin >> in.numbers[i]; //Ввод чисел + cin >> inp.numbers[i]; //Ввод чисел } cerr << "Enter bin count: "; - cin >> in.bin_count; //Кол-во корзин - return in; + cin >> inp.bin_count; //Кол-во корзин + return inp; } int main() { - auto in = input_data(); + auto in = input_data(cin); auto bins = make_histogram(in.numbers, in.bin_count); auto borders = make_borders(in.numbers, in.bin_count); show_histogram_svg(bins, borders, in.bin_count);