diff --git a/chtoto.cbp b/chtoto.cbp index e3425c8..e39e670 100644 --- a/chtoto.cbp +++ b/chtoto.cbp @@ -32,7 +32,13 @@ + + + + + + diff --git a/main.cpp b/main.cpp index bc83488..aec7f45 100644 --- a/main.cpp +++ b/main.cpp @@ -10,25 +10,28 @@ struct Input { size_t bin_count{}; }; -Input 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); + if (prompt) + cerr << "Enter number count = "; + + in >> number_count; + Input inn; + inn.numbers.resize(number_count); for (size_t i = 0; i < number_count; i++) { - cin >> in.numbers[i]; + in >> inn.numbers[i]; } - cerr << "Enter bin_count = "; - cin >> in.bin_count; - return in; + if (prompt) + cerr << "Enter bin_count = "; + in >> inn.bin_count; + return inn; } int main() { - auto in = input_data(); + auto in = input_data(cin, true); auto bins = make_histogram(in.numbers, in.bin_count); show_histogram_svg(bins);