diff --git a/main.cpp b/main.cpp index 3e0fee2..4cd9606 100644 --- a/main.cpp +++ b/main.cpp @@ -11,41 +11,35 @@ using namespace std; struct Input { vector numbers; size_t bin_count{}; - string colors_stroke; - string colors_fill; }; Input -input_data(){ +input_data(istream& in){ size_t number_count; cerr << "Enter number count: "; - cin >> number_count; + in >> number_count; - Input in; + Input iinn; - in.numbers.resize(number_count); + iinn.numbers.resize(number_count); cerr << "Enter numbers: " << endl; for (size_t i=0; i < number_count; i++) { - cin >> in.numbers[i]; + in >> iinn.numbers[i]; } cerr << "Enter bin count: "; - cin >> in.bin_count; - in.colors_stroke = "midnightblue"; - in.colors_fill = "deeppink"; + in >> iinn.bin_count; - input_colors(in.colors_stroke, in.colors_fill); - - return in; + return iinn; } int main() { - auto in = input_data(); - std::vector bins = make_histogram(in.numbers, in.bin_count); - show_histogram_svg(bins, in.colors_stroke, in.colors_fill); + Input iinn = input_data(cin); + std::vector bins = make_histogram(iinn.numbers, iinn.bin_count); + show_histogram_svg(bins); return 0; }