diff --git a/main.cpp b/main.cpp index bf38e37..ad45d55 100644 --- a/main.cpp +++ b/main.cpp @@ -12,34 +12,34 @@ struct Input size_t bin_count{}; }; -Input input_data() -{ - size_t number_count; +Input +input_data(istream& in) { + size_t number_count; cerr << "Enter number count: "; - cin >> number_count; + in >> number_count; - Input in; - in.numbers.resize(number_count); + Input data; + data.numbers.resize(number_count); vector numbers(number_count); for (int i = 0; i < number_count; i++) { cerr << "Number[" << i << "]="; - cin >> in.numbers[i]; + in >> data.numbers[i]; } cerr << "Enter bin count: "; - cin >> in.bin_count; - return in; + in >> data.bin_count; + return data; } int main() { - Input in = input_data(); + auto in = input_data(cin); auto bins = make_histogram(in.numbers, in.bin_count); - double min, max; + /*double min, max; double bin_size = (max - min) / in.bin_count; - //show_histogram_text(bins,in.bin_count, bin_size); + show_histogram_text(bins,in.bin_count, bin_size);*/ show_histogram_svg(bins); return 0; }