diff --git a/lab01.cbp b/lab01.cbp index 89f0c56..51bcc6e 100644 --- a/lab01.cbp +++ b/lab01.cbp @@ -34,7 +34,10 @@ + + + diff --git a/main.cpp b/main.cpp index 7b69fed..f14eca6 100644 --- a/main.cpp +++ b/main.cpp @@ -13,28 +13,28 @@ struct Input { size_t bin_count{}; }; -Input input_data() { +Input input_data(istream& in) { size_t number_count; cerr << "Enter number count: "; - cin >> number_count; + in >> number_count; - Input in; + Input on; - cout << "Enter bin count: "; - cin >> in.bin_count; + cerr << "Enter bin count: "; + in >> on.bin_count; - in.numbers.resize(number_count); + on.numbers.resize(number_count); cerr << "Enter numbers: "; for (size_t i = 0; i < number_count; i++) { - cin >> in.numbers[i]; + in >> on.numbers[i]; } - return in; + return on; }; int main(){ - Input in = input_data(); + auto in = input_data(cin); auto bins = make_histogram(in.numbers, in.bin_count); show_histogram_text(bins, in.bin_count); show_histogram_svg(bins); diff --git a/unittest.cbp b/unittest.cbp index 7f9621b..5a9c8c0 100644 --- a/unittest.cbp +++ b/unittest.cbp @@ -31,6 +31,10 @@ + + + +