diff --git a/main.cpp b/main.cpp index 5759bc4..06aa245 100644 --- a/main.cpp +++ b/main.cpp @@ -13,24 +13,25 @@ struct Input { }; Input -input_data() { - Input in; +input_data(istream& in) { + Input local; size_t number_count; size_t bin_count; cerr << "Enter number count: "; - cin >> in.number_count; + in >> local.number_count; + cerr << "Enter bin count: "; - cin >> in.bin_count; + in >> local.bin_count; - in.numbers.resize(in.number_count); + local.numbers.resize(local.number_count); - for (size_t i = 0; i < in.number_count; i++) { - cin >> in.numbers[i]; + for (size_t i = 0; i < local.number_count; i++) { + in >> local.numbers[i]; } - return in; + return local; }; int main() { @@ -38,7 +39,7 @@ int main() { std::string fill = "red"; std::string stroke = "#000000"; - auto in = input_data(); + auto in = input_data(cin); auto bins = make_histogram(in.numbers, in.bin_count); show_histogram_svg(bins, fill, stroke); return 0;