From 8c1ece419fc2f0914cee685e5e1364b507e44ded Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=98=D0=B2=D0=B0=D0=BD=20=D0=91=D0=B5=D0=BB=D0=B0=D0=B3?= =?UTF-8?q?=D0=B8=D0=BD?= Date: Mon, 27 Oct 2025 00:44:23 +0000 Subject: [PATCH] revert ef827e802929c78e42ffcbc34e3f38aca441f608 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit revert code: структурирование --- main.cpp | 169 ++++++++++++++++++++++++++++++++++--------------------- 1 file changed, 105 insertions(+), 64 deletions(-) diff --git a/main.cpp b/main.cpp index df8e157..dd9f1c9 100644 --- a/main.cpp +++ b/main.cpp @@ -1,83 +1,124 @@ #include #include -#include "histogram.h" -#include "histogram.cpp" - using namespace std; -struct Input { - vector numbers; - size_t bin_count{}; -}; - -Input -input_data() { - Input in; +int main() +{ + // + const size_t SCREEN_WIDTH = 80; // + const size_t MAX_ASTERISK = SCREEN_WIDTH - 3 - 1; // . (80 - 3 - 1 '|') + // size_t number_count; - cerr << "Enter number count: "; - cin >> number_count; - - in.numbers.resize(number_count); - for (size_t i = 0; i < number_count; i++) { - cin >> in.numbers[i]; + cerr << "Enter number count: "; // stderr + cin >> number_count; // + + // + vector numbers(number_count); // + for (size_t i = 0; i < number_count; i++) + { + cin >> numbers[i]; // } - cerr << "Enter number bin: "; - cin >> in.bin_count; - - return in; -} - - -void -show_histogram_text(const vector& bins) { - const size_t SCREEN_WIDTH = 80; - const size_t MAX_ASTERISK = SCREEN_WIDTH - 3 - 1; - - size_t max_count = bins[0]; - for (size_t i = 0; i < bins.size(); i++) { - if (bins[i] > max_count) { - max_count = bins[i]; + // ( ) + size_t bin_count; + cerr << "Enter number bin: "; // stderr + cin >> bin_count; // + + // + vector bins(bin_count); // ( ) + + // + if (number_count > 0) { // + double min = numbers[0]; // , - + double max = numbers[0]; // , - + for (double x : numbers) // + { + if (x < min) // + { + min = x; // + } + else if (x > max) // + { + max = x; // + } } - } - for (size_t i = 0; i < bins.size(); i++) { - if (bins[i] < 10) { - cout << " " << bins[i] << "|"; - } - else if (bins[i] < 100) { - cout << " " << bins[i] << "|"; - } - else if (bins[i] < 1000) { - cout << bins[i] << "|"; + // + double bin_size = (max - min) / bin_count; + + // + for (size_t i = 0; i < number_count; i++) // + { + bool found = false; // , , + + // ( ) + for (size_t j = 0; (j < bin_count - 1) && !found; j++) + { + // + double lo = min + j * bin_size; // + double hi = min + (j + 1) * bin_size; // + + // [lo, hi) + if ((lo <= numbers[i]) && (numbers[i] < hi)) + { + bins[j]++; // + found = true; // + } + } + + // ( ) + if (!found) + { + bins[bin_count - 1]++; // + } } - size_t height; - if (max_count <= MAX_ASTERISK) { - height = bins[i]; - } - else { - height = MAX_ASTERISK * (bins[i] * 1.0 / max_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]; // + } } - for (size_t j = 0; j < height; j++) { - cout << "*"; + // + for (size_t i = 0; i < bin_count; i++) // + { + // ( ) 3 + if (bins[i] < 10) { + cout << " " << bins[i] << "|"; // 2 + + "|" + } + else if (bins[i] < 100) { + cout << " " << bins[i] << "|"; // 1 + + "|" + } + else { + cout << bins[i] << "|"; // + "|" + } + + // ( ) + size_t height; + if (max_count <= MAX_ASTERISK) { + // , + height = bins[i]; + } + else { + // : + height = MAX_ASTERISK * (static_cast(bins[i]) / max_count); + } + + // + for (size_t j = 0; j < height; j++) { + cout << "*"; + } + cout << endl; // } - cout << endl; + } else { + cout << "No numbers entered." << endl; } -} - -int -main() { - Input in = input_data(); - - double min, max; - find_minmax(in.numbers, min, max); - - auto bins = make_histogram(in.numbers, in.bin_count, min, max); - show_histogram_text(bins); - return 0; + return 0; // }