diff --git a/lab01.cbp b/lab01.cbp index d541ad7..e7b48a0 100644 --- a/lab01.cbp +++ b/lab01.cbp @@ -32,7 +32,14 @@ + + + + + + + diff --git a/main.cpp b/main.cpp index 198e246..54067cd 100644 --- a/main.cpp +++ b/main.cpp @@ -10,20 +10,20 @@ struct Input { size_t bin_count{}; }; Input -input_data(){ - size_t number_count, bin_count; +input_data(istream& in){ + size_t number_count; cerr << "Enter number count: "; cin >> number_count; - Input in; - in.numbers.resize(number_count); + Input inp; + inp.numbers.resize(number_count); for (size_t i = 0; i < number_count; i++) { cerr << "Enter Num[" << i << "]: "; - cin >> in.numbers[i]; + cin >> inp.numbers[i]; } cerr << "Enter bin count: "; - cin >> in.bin_count; - return in; + cin >> inp.bin_count; + return inp; } @@ -31,7 +31,7 @@ input_data(){ int main() { - auto in = input_data(); + auto in = input_data(cin); auto bins = make_histogram(in.numbers, in.bin_count); show_histogram_svg(bins); diff --git a/unittest.cbp b/unittest.cbp index 6da4486..65bd1be 100644 --- a/unittest.cbp +++ b/unittest.cbp @@ -31,6 +31,12 @@ + + + + + +