diff --git a/main.cpp b/main.cpp index b91797c..5297190 100644 --- a/main.cpp +++ b/main.cpp @@ -9,26 +9,34 @@ struct Input { size_t bin_count{}; }; -Input input_data() { +Input input_data(istream& in, bool promt = false) { + + //переменная-экземпляр + Input qin; + //ввод количества чисел size_t number_count; - cerr << "Enter number count: "; - cin >> number_count; - //переменная-экземпляр - Input in; + if( promt ) { + cerr << "Enter number count: "; + } + in >> number_count; + //ввод чисел - in.numbers.resize(number_count); + qin.numbers.resize(number_count); for (size_t i = 0 ; i < number_count ; i++) { - cin >> in.numbers[i]; + in >> qin.numbers[i]; } + //ввод количества корзин - cerr << "Enter bin count: "; - cin >> in.bin_count; - return in; + if( promt ) { + cerr << "Enter bin count: "; + } + in >> qin.bin_count; + return qin; } int main() { - auto in = input_data(); + auto in = input_data(cin); auto bins = make_histogram(in.numbers, in.bin_count); show_histogram_svg(bins); }