Добавлены функции и структурирование

.gitignore

@@ -1,4 +1,6 @@
-/bin
+bin/
-/obj
+obj/
-/*.layout
+*.cbp
-/*.depend
+*.layout
+*.depend
+*.user

main.cpp

@@ -1,84 +1,123 @@
-#include <vector>
-#include <iostream>
-
 using namespace std;
 
-int main() {
+
-    const size_t SCREEN_WIDTH = 80;
+struct Input {
-    const size_t MAX_ASTERISK = SCREEN_WIDTH - 3 - 1;
+    vector<double> numbers;
-    size_t number_count;
+    size_t bin_count{};
+};
+
+Input input_data(){
+    size_t number_count, bin_count;
     cerr << "Enter number count: ";
     cin >> number_count;
+    Input in;
+    in.numbers.resize(number_count);
 
-    vector<double> numbers(number_count);
+    for (size_t i = 0; i < number_count; i++)
-    cerr << "Enter numbers: ";
+    {
-    for (size_t i = 0; i < number_count; i++) {
+        cerr << "Enter Num[" << i << "]: ";
-        cin >> numbers[i];
+        cin >> in.numbers[i];
     }
 
-    size_t bin_count;
     cerr << "Enter bin count: ";
-    cin >> bin_count;
+    cin >> in.bin_count;
-
+    return in;
-    vector<size_t> bins(bin_count, 0);
+}
 
-    double min = numbers[0];
+void find_minmax(const vector<double> &numbers, double &min, double &max)
-    double max = numbers[0];
+{
-    for (double x : numbers) {
+    max = numbers[0];
-        if (x < min) {
+    min = numbers[1];
+    for (double x: numbers)
+    {
+        if (x < min)
+        {
             min = x;
         }
-        else if (x > max) {
+        else if (x > max)
+        {
             max = x;
         }
     }
+    return;
+}
 
+vector<size_t> make_histogram (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);
-    for (size_t i = 0; i < number_count; i++) {
+    for (size_t i = 0; i < numbers.size(); i++)
+    {
         bool found = false;
-        for (size_t j = 0; (j < bin_count - 1) && !found; j++) {
+        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)) {
+            if ((lo <= numbers[i]) && (numbers[i] < hi))
+            {
                 bins[j]++;
                 found = true;
+
         }
-        }
+        if (!found)
-        if (!found) {
+        {
             bins[bin_count - 1]++;
         }
     }
-    size_t max_bin_count = 0;
+    return bins;
-       for (size_t bin : bins) {
+}
-            if (bin > max_bin_count) {
+
-                max_bin_count = bin;
+void show_histogram_text(vector<size_t> bins, size_t bin_count)
+{
+    const size_t SCREEN_WIDTH = 80;
+    const size_t MAX_ASTERISK = SCREEN_WIDTH - 3 - 1;
+
+    double max_bin;
+    size_t height;
+    max_bin = bins[0];
+    height = bins[0];
+    for (size_t i = 0; i < bin_count; i++)
+    {
+
+        if (bins[i] > max_bin){
+            max_bin = bins[i];
         }
     }
 
-    if (max_bin_count <= MAX_ASTERISK) {
+    bool flag = false;
-        for (size_t i = 0; i < bin_count; i++) {
+    if ( max_bin > 80)
-            if (bins[i] < 10) cout << " ";
+    {
-            cout << " " << bins[i] << "|";
+        flag = true;
-            for (size_t j = 0; j < bins[i]; j++) {
-                cout << "*";
-            }
-            cout << endl;
     }
-    } else {
+    for (size_t i = 0; i < bin_count; i++)
-        for (size_t i = 0; i < bin_count; i++) {
+    {
-            size_t height = static_cast<size_t>(MAX_ASTERISK * (static_cast<double>(bins[i]) / max_bin_count));
+        if (bins[i] < 100)
-            // Âûðàâíèâàíèå ïîäïèñè
+            cout << " ";
-            if (bins[i] < 100) cout << " ";
+        if (bins[i] < 10)
-            if (bins[i] < 10) cout << " ";
+            cout << " ";
         cout << bins[i] << "|";
-
+        if( flag == true)
-            for (size_t j = 0; j < height; j++) {
+        {
+            height = MAX_ASTERISK * (static_cast<double>(bins[i]) / max_bin);
+        }
+        else
+        {
+            height = bins[i];
+        }
+        for (size_t j = 0; j < height; j++)
+        {
             cout << "*";
         }
         cout << endl;
     }
-    }
+}
 
+int main()
+{
+    auto in = input_data();
+    auto bins = make_histogram(in.numbers, in.bin_count);
+    show_histogram_text(bins, in.bin_count);
     return 0;
 }