diff --git a/main.cpp b/main.cpp index ab81cdc..762a047 100644 --- a/main.cpp +++ b/main.cpp @@ -11,7 +11,8 @@ struct Input { size_t max_count{}; }; Input -input_data(istream& cin) { +input_data(istream& cin, bool prompt) { + if (prompt==true){ Input in; cerr << "Enter number count: "; cin >> in.number_count; @@ -27,10 +28,26 @@ input_data(istream& cin) { size_t max_count; in.max_count = 0; return in; + } + if (prompt==false){ + Input in; + cin >> in.number_count; + vector numbers(in.number_count); + in.numbers.resize(in.number_count); + for (size_t i = 0; i < in.number_count; i++) { + cin >> in.numbers[i]; + } + size_t bin_count; + cin >> in.bin_count; + + size_t max_count; + in.max_count = 0; + return in; + } } int main() { - auto in = input_data(cin); + auto in = input_data(cin, true); auto bins = make_histogram(in.numbers, in.bin_count, in.number_count, in.max_count); show_histogram_svg(bins, in.max_count, in.bin_count); return 0;