code: код разделен по файлам histograms и texts

histogram.cpp

@@ -0,0 +1,42 @@
+#include "histogram.h"
+
+bool find_minmax(vector<double> vec, double& min, double& max) {
+    if (vec.size() == 0) {
+        cerr << "Empty vec";
+        return false;
+    }
+    min = vec[0];
+    max = vec[0];
+    for (double x : vec) {
+        if (x < min) {
+            min = x;
+        }
+        else if (x > max)
+        {
+            max = x;
+        }
+    }
+    return true;
+}
+vector<size_t> make_histogram(size_t number, vector<double> vec) {
+    vector<size_t> bins(number);
+    double mn, mx;
+    find_minmax(vec, mn, mx);
+    float bin_size = (mx - mn) / number;
+    for (size_t i = 0; i < vec.size(); i++) {
+        bool fl = false;
+        for (size_t j = 0; (j < number - 1) && !fl; j++) {
+            auto lo = mn + j * bin_size;
+            auto hi = mn + (j + 1) * bin_size;
+            if ((lo <= vec[i]) && (vec[i] < hi)) {
+                bins[j]++;
+                fl = true;
+            }
+        }
+        if (!fl) {
+            bins[number - 1]++;
+
+        }
+    }
+    return bins;
+}

histogram.h

@@ -0,0 +1,5 @@
+#include <vector>
+#include <iostream>
+
+using namespace std;
+vector<size_t> make_histogram(size_t number, vector<double> vec);

main.cpp

@@ -1,159 +1,28 @@
-#include <iostream>
+#include "histogram.h"
-#include <vector>
+#include "text.h"
 
-using namespace std;
 
 struct Input {
-    vector<double> numbers;
+    vector<double> vec;
-    size_t bin_count{};
+    size_t korz{};
 };
-
+Input input_data() {
-Input
-input_data() {
-    size_t number_count, bin_count;
-    double minl, maxl, bin_size;
-
-
-    cerr << "Enter the number of elements: ";
-    cin >> number_count;
-
     Input in;
-    in.numbers.resize(number_count);
+    size_t n, korz;
-
-    vector<double> numbers(number_count);
-
-    cerr << "\nEnter " << number_count << " elements:" << endl;
-    for (size_t i = 0; i < number_count; i++) {
-        cin >> in.numbers[i];
-    }
-
-
-    cerr << "Enter the number of bins: ";
-    cin >> in.bin_count;
 
+    cerr << "Enter the number of elements: ";
+    cin >> n;
+    in.vec.resize(n);
+    cerr << "Enter elements: ";
+    for (size_t i = 0; i < n; i++)
+        cin >> in.vec[i];
+    cerr << "Enter bin count: ";
+    cin >> in.korz;
     return in;
 }
 
-void
-find_minmax(const vector<double>& numbers, double& minl, double& maxl) {
-    minl = numbers[0];
-    maxl = numbers[0];
-
-    for (double x : numbers) {
-        if (x < minl) {
-            minl = x;
-        } else {
-            if (x > maxl) {
-                maxl = x;
-            }
-        }
-    }
-}
-
-vector<size_t>
-make_histogram(const vector<double>& numbers, size_t& bin_count) {
-    double minn, maxn;
-    find_minmax(numbers, minn, maxn);
-
-    double bin_size = (maxn - minn) / bin_count;
-
-    vector<size_t> bins(bin_count, 0);
-
-    for (size_t i = 0; i < numbers.size(); i++) {
-        bool found = false;
-        for (size_t j = 0; (j < bin_count - 1) && !found; j++) {
-            auto lo = minn + j * bin_size;
-            auto hi = minn + (j + 1) * bin_size;
-            if ((numbers[i] >= lo) && (numbers[i] <= hi)) {
-                bins[j]++;
-                found = true;
-            }
-        }
-        if (!found) {
-            bins[bin_count - 1]++;
-        }
-    }
-    return bins;
-}
-
-void
-show_histogram_text(const vector<size_t> bins, size_t bin_count) {
-    size_t max_count = bins[0];
-    for (size_t i = 1; i < bin_count; i++) {
-        if (bins[i] > max_count) {
-            max_count = bins[i];
-        }
-    }
-
-    const size_t SCREEN_WIDTH = 80;
-    const size_t MAX_ASTERISK = SCREEN_WIDTH - 3 - 1;
-
-
-    short space_count;
-
-    cerr << "\nHistogram:" << endl;
-
-    if (max_count <= MAX_ASTERISK) {
-        for (size_t i = 0; i < bin_count; i++) {
-            if (bins[i] < 10) {
-                space_count = 2;
-            } else if (bins[i] >= 10 && bins[i] < 100) {
-                space_count = 1;
-            } else if (bins[i] >= 100 && bins[i] < 1000) {
-                space_count = 0;
-            }
-
-
-
-            for (size_t k = 0; k < space_count; k++) {
-                cout << " ";
-            }
-
-            cout << bins[i];
-
-            cout << "|";
-
-
-            for (size_t j = 0; j < bins[i]; j++) {
-                cout << "*";
-            }
-
-            cout << "\n";
-        }
-    } else {
-        for (size_t i = 0; i < bin_count; i++) {
-            if (bins[i] < 10) {
-                space_count = 2;
-            } else if (bins[i] >= 10 && bins[i] < 100) {
-                space_count = 1;
-            } else if (bins[i] >= 100 && bins[i] < 1000) {
-                space_count = 0;
-            }
-
-
-            for (size_t k = 0; k < space_count; k++) {
-                cout << " ";
-            }
-
-            cout << bins[i];
-
-            cout << "|";
-
-            size_t height = static_cast<size_t>(MAX_ASTERISK * (static_cast<double>(bins[i]) / max_count));
-            for (size_t j = 0; j < height; j++) {
-                cout << "*";
-            }
-
-            cout << "\n";
-        }
-    }
-}
-
 int main() {
-
     auto in = input_data();
-    auto bins = make_histogram(in.numbers, in.bin_count);
+    auto bins = make_histogram(in.korz, in.vec);
-    show_histogram_text(bins, in.bin_count);
+    show_histogram(bins);
-
-    return 0;
 }

text.cpp

@@ -0,0 +1,82 @@
+#include "text.h"
+
+void show_histogram(std::vector<size_t> bins) {
+    bool gigant = false;
+    auto spaces = 0;
+    size_t mx_count = 0;
+    for (auto x : bins) {
+        if (x > 76) {
+            gigant = true;
+        }
+        if (x > mx_count) {
+            mx_count = x;
+        }
+        auto len = 0;
+        while (x > 0) {
+            x /= 10;
+            len++;
+        }
+        if (len > spaces) {
+            spaces = len;
+        }
+    }
+    if (spaces == 1) {
+        for (size_t i = 0; i < bins.size(); i++) {
+            std::cout << "  " << bins[i] << "|";
+            if (gigant) {
+                if (bins[i] == mx_count) {
+                    for (size_t j = 0; j < 76; j++) {
+                        std::cout << "*";
+                    }
+                }
+                else
+                {
+                    for (size_t j = 0; j < 76 * static_cast<double>(bins[i]) / mx_count; j++) {
+                        std::cout << "*";
+                    }
+                }
+            }
+            else
+            {
+                for (size_t j = 0; j < bins[i]; j++) {
+                    std::cout << "*";
+                }
+                std::cout << std::endl;
+            }
+        }
+    }
+    else
+    {
+        for (size_t i = 0; i < bins.size(); i++) {
+            int len = 1;
+            int k = bins[i];
+            for (; k /= 10; ++len);
+            while (len < spaces) {
+                std::cout << " ";
+                len++;
+            }
+            std::cout << bins[i];
+            std::cout << "|";
+            if (gigant) {
+                if (bins[i] == mx_count) {
+                    for (size_t j = 0; j < 76; j++) {
+                        std::cout << "*";
+                    }
+                }
+                else
+                {
+                    for (size_t j = 0; j < (76 * static_cast<double>(bins[i]) / mx_count - 1); j++) {
+                        std::cout << "*";
+                    }
+                }
+            }
+            else
+            {
+                for (size_t j = 0; j < bins[i]; j++) {
+                    std::cout << "*";
+                }
+            }
+            std::cout << std::endl;
+        }
+    }
+}

text.h

@@ -0,0 +1,4 @@
+#include <iostream>
+#include <vector>
+
+void show_histogram(std::vector<size_t> bins);