diff --git a/main.cpp b/main.cpp index b568345..8016909 100644 --- a/main.cpp +++ b/main.cpp @@ -5,39 +5,38 @@ using namespace std; -struct Input{ +struct Input { vector numbers; size_t bin_count{}; +}; -} - - -Input input_data(){ +// Обновленная функция input_data +Input input_data(istream& in, bool prompt) { size_t number_count; - cerr<<"Enter number count:"; - cin >> number_count; - - Input in; - in.numbers.resize(number_count); - - for(size_t i=0; i>in.numbers[i]; + if (prompt) { + cerr << "Enter number count: "; } + in >> number_count; - cerr<<"Enter bin count: "; - cin>>in.bin_count; - return in; -} + Input input; + input.numbers.resize(number_count); + for (size_t i = 0; i < number_count; i++) { + in >> input.numbers[i]; + } + if (prompt) { + cerr << "Enter bin count: "; + } + in >> input.bin_count; -int main(){ + return input; +} - auto in = input_data(); +int main() { + // Вызываем input_data с cin и указанием вывода подсказок + auto in = input_data(cin, true); auto bins = make_histogram(in.numbers, in.bin_count); show_histogram_svg(bins); - - } -