2.Структурирование программы при помощи функций

TWOPO.cpp

@@ -3,90 +3,90 @@
 
 using namespace std;
 
-int main()
-{
-    setlocale(LC_ALL, "Russian");
-    size_t number_count; size_t bin_count;size_t max_count;
+struct Input {
+    vector<double> numbers;
+    size_t bin_count{};
+};
 
-    cerr << "Ââåäèòå êîëè÷åñòâî îöåíîê: ";
+//ââîä
+Input input_data() {
+    size_t number_count;
+    cout << "Ââåäèòå êîëè÷åñòâî îöåíîê: ";
     cin >> number_count;
 
-    vector<double> numbers(number_count);
-    vector<size_t> bins(bin_count);
-
+    Input in; // Ýêçåìïëÿð ñòðóêòóðû Input
+    in.numbers.resize(number_count); // Èçìåíÿåì ðàçìåð âåêòîðà
 
+    cout << "Ââåäèòå îöåíêè:\n";
     for (size_t i = 0; i < number_count; i++) {
-        cerr << "Ââåäèòå ÷èñëî " << i + 1 << " : ";
-        cin >> numbers[i];
+        cin >> in.numbers[i]; // Ââîäèì ýëåìåíòû âåêòîðà
+    }
+
+    cout << "Ââåäèòå êîëè÷åñòâî êîðçèí: ";
+    cin >> in.bin_count; // Ââîäèì êîëè÷åñòâî êîðçèí
+
+    return in; // Âîçâðàùàåì ñòðóêòóðó
 }
-    cerr << "Ââåäèòå êîëè÷åñòâî êîðçèí: ";
-    cin >> bin_count;
-    //íàõîæäåíìå èíòåðâàëîâ êîðçèí(min è max)
-    double min = numbers[0];
-    double max = numbers[0];
+
+//ïîèñê ìèíèìóìà è ìàêñèìóìà
+void find_minmax(const vector<double>& 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;
         }
     }
-    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++) {
-        auto lo = min + j * bin_size;
-        auto hi = min + (j + 1) * bin_size;
-        if ((lo <= numbers[i]) && (numbers[i] < hi)) {
-            bins[j]++;
-            found = true;
 }
+
+//ñîçäàíèå ãèñòîãðàììû
+vector<size_t> make_histogram(const vector<double>& numbers, size_t bin_count) {
+    double min, max;
+    find_minmax(numbers, min, max);
+
+    double bin_size = (max - min) / bin_count;
+    vector<size_t> bins(bin_count, 0);
+
+    for (double number : numbers) {
+        size_t bin_index = static_cast<size_t>((number - min) / bin_size);
+        if (bin_index >= bin_count) {
+            bin_index = bin_count - 1;
         }
-        if (!found) {
-        bins[bin_count - 1]++;
-    }
-    }
-    //maxcount
-    for(size_t i = 0; i < bin_count; i++){
-        if (bins[i] > max_count){
-            max_count = bins[i];
-        }
+        bins[bin_index]++;
     }
 
-    //âûâîä
-    //
-    for(size_t i = 0; i < bin_count; i++){
-
-        size_t count = 0;
-        //cout << min + i*bin_size<< "|";
-        size_t num = bins[i];
-        while(num != 0){
-            num/=10;
-            count++;}
-        size_t z = (3 - count);
-        while(z > 0){
-            cout << " ";
-            z--;
+    return bins;
 }
 
+//âûâîä
+void show_histogram_text(const vector<size_t>& bins, double min, double bin_size) {
+    for (size_t i = 0; i < bins.size(); i++) {
+        double lo = min + i * bin_size;
+        double up = min + (i + 1) * bin_size;
         cout << bins[i] << " | ";
-        if(max_count > 76){
-            size_t height = 76 * (static_cast<double>(bins[i] / max_count));
-            for(size_t j = 0; j < height; j++) {
-            cout << "*";
-            }
-            cout << endl;
-        }
-        else{
-        for(size_t j = 0; j < (bins[i]); j++) {
+
+        for (size_t j = 0; j < bins[i]; j++) {
             cout << "*";
         }
         cout << endl;
     }
 }
-    cout << "Êîíåö1";
-    cout << "Êîíåö2";
+
+int main() {
+    setlocale(LC_ALL, "Russian");
+
+    auto in = input_data();
+
+    auto bins = make_histogram(in.numbers, in.bin_count);
+
+    double min, max;
+
+    double bin_size = (max - min) / in.bin_count;
+
+    show_histogram_text(bins, min, bin_size);
+
+    return 0;
 }