diff --git a/main.cpp b/main.cpp index 71dbe34..f7834c8 100644 --- a/main.cpp +++ b/main.cpp @@ -15,32 +15,32 @@ struct Input }; Input -input_data() +input_data(istream& in) { size_t number_count; cerr << "count="; - cin >> number_count; + in >> number_count; - Input in; + Input rez; - in.numbers.resize(number_count); + rez.numbers.resize(number_count); for (size_t i = 0; i < number_count; i++) { - cin >> in.numbers[i]; + in >> rez.numbers[i]; } cerr << "bin_count= "; - cin >> in.bin_count; + in >> rez.bin_count; - return in; + return rez; } 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;