diff --git a/.gitignore b/.gitignore index 55ef8f6..8575b62 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,6 @@ cs-lab34.cbp cs-lab34.depend unittest.cbp +Untitled1.c /bin /obj diff --git a/main.cpp b/main.cpp index 7ae72b6..b004b49 100644 --- a/main.cpp +++ b/main.cpp @@ -6,43 +6,57 @@ using namespace std; - struct Input { + vector dn; vector numbers; size_t bin_count{}; + size_t number_count{}; + size_t max_count{}; }; -Input input_data() { - - size_t number_count; - - cerr << "Enter number count: "; - cin >> number_count; - +Input +input_data(istream& cin, bool prompt) { + if (prompt == true){ Input in; - - cerr << "Enter number of bins: "; + cerr << "Enter number count: "; + 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; + cerr << "Enter bin count: "; cin >> in.bin_count; - in.numbers.resize(number_count); - - cerr << "Enter numbers: "; - for (size_t i = 0; i < number_count; i++) - { + size_t max_count; + in.max_count = 0; + return in; + } + else{ + 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(){ bool res = false; - Input in = input_data(); + auto in = input_data(cin, true); auto bins = make_histogram(in.numbers, in.bin_count);