diff --git a/main.cpp b/main.cpp index bd190b8..b531a44 100644 --- a/main.cpp +++ b/main.cpp @@ -13,13 +13,12 @@ struct Input { }; - Input input_data(istream& inp) { - - + Input input_data(istream& inp, bool prompt) { +Input in; +if (prompt){ size_t number_count; cerr << "Enter number count: "; inp >> number_count; -Input in; in.numbers.resize(number_count); for (size_t i = 0; i < number_count; i++) { @@ -28,8 +27,21 @@ in.numbers.resize(number_count); in.bin_count; cerr << "Enter bin count: "; inp >> in.bin_count; +} +else { + size_t number_count; + inp >> number_count; + +in.numbers.resize(number_count); + for (size_t i = 0; i < number_count; i++) { + inp >> in.numbers[i]; + } + +in.bin_count; +inp >> in.bin_count; +} return in; } @@ -38,8 +50,8 @@ cerr << "Enter bin count: "; inp >> in.bin_count; int main() { unsigned int n; - -auto in = input_data(cin); +bool prompt=false; +auto in = input_data(cin, prompt); double min,max; auto bins = make_histogram(in.numbers, in.bin_count);