diff --git a/main.cpp b/main.cpp index d1fa10b..f12dd1b 100644 --- a/main.cpp +++ b/main.cpp @@ -4,6 +4,7 @@ #include using namespace std; +const size_t MAX_ELEMENT = 76; struct Input { vector numbers; size_t bin_count{}; @@ -25,17 +26,16 @@ input_data(){ cin >> in.numbers[i]; } - in.bin_count; cerr << "Enter bin count: "; cin >> in.bin_count; return in; } void -find_minmax(vector numbers, double& min, double& max){ +find_minmax(const vector& numbers, double& min, double& max){ min = numbers[0]; max = numbers[0]; - for(size_t i=0; i < sizeof(numbers) / sizeof(numbers[0]); i++){ + for(size_t i=0; i < numbers.size(); i++){ if (numbers[i] < min) { min = numbers[i]; @@ -47,27 +47,23 @@ find_minmax(vector numbers, double& min, double& max){ } } - -int main() -{ - const size_t MAX_ELEMENT = 76; - - Input in = input_data(); +vector +make_histogram(const vector& numbers, size_t bin_count){ double min, max; - find_minmax(in.numbers, min, max); + find_minmax(numbers, min, max); - vector bins(in.bin_count); - double bin_size = (max - min) / in.bin_count; + vector bins(bin_count); - for (size_t i = 0; i < sizeof(in.numbers) / sizeof(in.numbers[0]); i++) + double bin_size = (max - min) / bin_count; + for (size_t i = 0; i < numbers.size(); i++) { bool found = false; - for (size_t j = 0; (j < in.bin_count - 1) && !found; j++) + for (size_t j = 0; (j < bin_count - 1) && !found; j++) { auto lower_Bound = min + j * bin_size; auto upper_Bound = min + (j + 1) * bin_size; - if ((lower_Bound <= in.numbers[i]) && (in.numbers[i] < upper_Bound)) + if ((lower_Bound <= numbers[i]) && (numbers[i] < upper_Bound)) { bins[j]++; found = true; @@ -75,23 +71,34 @@ int main() } if (!found) { - bins[in.bin_count - 1]++; + bins[bin_count - 1]++; } } double max_count = bins[0]; - for (size_t j=0; j < in.bin_count; j++){ + for (size_t j=0; j < bin_count; j++){ if (bins[j] > max_count) { max_count = bins[j]; } } - vector height(in.bin_count); - for (size_t j=0; j < in.bin_count; j++){ + return bins; +} + +void +show_histogram_text(const vector bins, size_t bin_count){ + double max_count = bins[0]; + for (size_t j=0; j < bin_count; j++){ + if (bins[j] > max_count) { + max_count = bins[j]; + } + } + vector height(bin_count); + for (size_t j=0; j < bin_count; j++){ height[j] = MAX_ELEMENT * (bins[j]/max_count); } if (max_count > MAX_ELEMENT){ - for (size_t j=0; j < in.bin_count; j++) + for (size_t j=0; j < bin_count; j++) { if (bins[j] < 100) { cout << " "; @@ -108,7 +115,7 @@ int main() } } else { - for (size_t j=0; j < in.bin_count; j++) + for (size_t j=0; j < bin_count; j++) { if (bins[j] < 100) { cout << " "; @@ -125,3 +132,12 @@ int main() } } } + +int main() +{ + + auto in = input_data(); + auto bins = make_histogram(in.numbers, in.bin_count); + show_histogram_text(bins, in.bin_count); + return 0; +}