diff --git a/main.cpp b/main.cpp index 444354b..41db0a6 100644 --- a/main.cpp +++ b/main.cpp @@ -6,26 +6,34 @@ using namespace std; const size_t SCREEN_WIDTH = 80; const size_t MAX_ASTERISK = SCREEN_WIDTH - 4; -int main() { +struct Input { + vector numbers; + size_t bin_count{}; +}; +Input +input_data() { size_t number_count; cerr << "Enter number count: "; cin >> number_count; - vector numbers(number_count); + Input in; + in.numbers.resize(number_count); cerr << "Enter massive elements: "; for (size_t i = 0; i < number_count; i++) { - cin >> numbers[i]; + cin >> in.numbers[i]; } - size_t bin_count; + in.bin_count; //ÇÀ×ÅÌ cerr << "Enter bin count: "; - cin >> bin_count; + cin >> in.bin_count; + return in; +} - vector bins(bin_count); +void find_minmax(const vector& numbers, double& mini, double& maxi) { - double mini = numbers[0]; - double maxi = numbers[0]; + mini = numbers[0]; + maxi = numbers[0]; for (double x : numbers) { if (x < mini) { mini = x; @@ -34,14 +42,22 @@ int main() { maxi = x; } } +} + +vector +make_histogram(const vector& numbers, int bin_count) { + double mini, maxi; + find_minmax(numbers, mini, maxi); + + vector bins(bin_count); double bin_size = (maxi - mini) / bin_count; - for (size_t i = 0; i < number_count; i++) { + for (double num : numbers) { bool found = false; for (size_t j = 0; (j < bin_count - 1) && !found; j++){ auto lo = mini + j * bin_size; auto hi = mini + (j + 1) * bin_size; - if ((lo <= numbers[i]) && (numbers[i] < hi)) { + if ((lo <= num) && (num < hi)) { bins[j]++; found = true; } @@ -51,37 +67,45 @@ int main() { } } + return bins; +} - - size_t max_count = bins[0]; - for (size_t i = 0; i < bin_count; i++) { - if (bins[i]>max_count) { - max_count = bins[i]; - } +void show_histogram_text(const vector& bins, size_t bin_count) { + size_t max_count = bins[0]; + for (size_t i = 0; i < bin_count; i++) { + if (bins[i] > max_count) { + max_count = bins[i]; } + } vector height(bin_count); for (size_t i = 0; i < bin_count; i++) { if (max_count > MAX_ASTERISK) { height[i] = round(MAX_ASTERISK * (static_cast(bins[i]) / max_count)); } else { - height[i]=bins[i]; + height[i] = bins[i]; } } for (size_t i = 0; i < bin_count; i++) { - if (bins[i] < 10) { - cout << " "; - } else if (bins[i] < 100) { - cout << " "; - } + if (bins[i] < 10) { + cout << " "; + } else if (bins[i] < 100) { + cout << " "; + } cout << bins[i] << "| "; - - for (size_t j = 0; j