diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..4c7473d --- /dev/null +++ b/.gitignore @@ -0,0 +1,2 @@ +/bin +/obj diff --git a/main.cpp b/main.cpp index 1f12e31..f9d40e3 100644 --- a/main.cpp +++ b/main.cpp @@ -1,87 +1,89 @@ #include #include +#include // Для std::min и std::max (если вы еще не включили) + using namespace std; -int main() -{ - const size_t SCREEN_WIDTH = 80; - const size_t MAX_ASTERISK = SCREEN_WIDTH - 3 - 1; +struct Input { + vector numbers; + size_t bin_count{}; +}; + +Input +input_data() { + Input in; - size_t number_count; cerr << "Enter number count: "; + size_t number_count; cin >> number_count; - vector numbers(number_count); - for (size_t i = 0; i < number_count; i++) - { - cin >> numbers[i]; + in.numbers.resize(number_count); + for (size_t i = 0; i < number_count; i++) { + cin >> in.numbers[i]; } - size_t bin_count; cerr << "Enter number bin: "; - cin >> bin_count; + cin >> in.bin_count; - vector bins(bin_count); + return in; +} - double min = numbers[0]; - double max = numbers[0]; - for (double x : numbers) - { - if (x < min) - { +void +find_minmax(const vector& numbers, double& min, double& max) { + min = numbers[0]; + max = numbers[0]; + for (double x : numbers) { + if (x < min) { min = x; } - else if (x > max) - { + if (x > max) { max = x; } } +} + +vector +make_histogram(const vector& numbers, size_t bin_count) { + double min, max; + find_minmax(numbers, min, max); + + vector bins(bin_count); double bin_size = (max - min) / bin_count; - for (size_t i = 0; i < number_count; i++) - { + for (size_t i = 0; i < numbers.size(); i++) { bool found = false; - for (size_t j = 0; (j < bin_count - 1) && !found; j++) - { + for (size_t j = 0; (j < bin_count - 1) && !found; j++) { auto lo = min + j * bin_size; auto hi = min + (j + 1) * bin_size; - if ((lo <= numbers[i]) && (numbers[i] < hi)) - { + if ((lo <= numbers[i]) && (numbers[i] < hi)) { bins[j]++; found = true; } } - if (!found) - { + if (!found) { bins[bin_count - 1]++; } } - size_t max_count = bins[0]; - for (size_t i = 0; i < bin_count; i++) - { - if (bins[i] > max_count) { - max_count = bins[i]; - } - } + return bins; +} + +void +show_histogram_text(const vector& bins, size_t max_count, size_t MAX_ASTERISK) { // Убрали bin_count т.к. есть bins.size() - for (size_t i = 0; i < bin_count; i++) - { - if (bins[i]<10) { + for (size_t i = 0; i < bins.size(); i++) { + if (bins[i] < 10) { cout << " " << bins[i] << "|"; - } - else if (bins[i]<100) { + } else if (bins[i] < 100) { cout << " " << bins[i] << "|"; - } - else if (bins[i]<1000) { + } else if (bins[i] < 1000) { cout << bins[i] << "|"; } size_t height; - if (max_count<=MAX_ASTERISK) { + if (max_count <= MAX_ASTERISK) { height = bins[i]; - } - else { + } else { height = MAX_ASTERISK * (static_cast(bins[i]) / max_count); } for (size_t j = 0; j < height; j++) { @@ -89,6 +91,23 @@ int main() } cout << endl; } +} + +int +main() { + const size_t SCREEN_WIDTH = 80; + const size_t MAX_ASTERISK = SCREEN_WIDTH - 3 - 1; + + auto in = input_data(); + auto bins = make_histogram(in.numbers, in.bin_count); + + size_t max_count = bins[0]; + for (size_t i = 0; i < bins.size(); i++) { // Исправили цикл на bins.size() + if (bins[i] > max_count) { + max_count = bins[i]; + } + } + show_histogram_text(bins, max_count, MAX_ASTERISK); return 0; }