diff --git a/labor01.cpp b/labor01.cpp index 78b1477..615ce80 100644 --- a/labor01.cpp +++ b/labor01.cpp @@ -13,25 +13,25 @@ struct Input { }; Input -input_data() { +input_data(istream& inn) { size_t number_count; cerr << "Enter number_count: "; - cin >> number_count; + inn >> number_count; Input in; cerr << "Enter numbers: "; in.numbers.resize(number_count); for (size_t i = 0; i < number_count; i++) { - cin >> in.numbers[i]; + inn >> in.numbers[i]; } cerr << "Enter bin_count: "; - cin >> in.bin_count; + inn >> in.bin_count; in.colors.resize(in.bin_count); sort(begin(in.numbers), end(in.numbers)); in.numbers.erase(unique(begin(in.numbers), end(in.numbers)), end(in.numbers)); number_count = in.numbers.size(); cerr << "Enter colors: "; for (size_t i = 0; i < in.bin_count; i++) { - cin >> in.colors[i]; + inn >> in.colors[i]; } return in; } @@ -39,7 +39,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, in.colors); }