code: расчет гистограммы и её вывод на экран выведены в отдельную функцию

main.cpp

@@ -37,32 +37,34 @@ find_minmax(const std::vector<double>& numbers, double& min, double& max){
         }
     }
 }
-int
+vector<size_t>
-main() {
+make_histogram(const std::vector<double>& numbers, size_t bin_count){
-    size_t i, j;
     double min, max;
-    Input in = input_data();
+    find_minmax (numbers, min, max);
-    find_minmax (in.numbers, min, max);
+    double bin_size = (max - min) / bin_count;
-    double bin_size = (max - min) / in.bin_count;
+    std::vector<size_t> bins(bin_count);
-    vector<size_t> bins(in.bin_count);
+    for (auto x : numbers) {
-    for (auto x : in.numbers) {
         bool found = false;
-        for (j = 0; (j < (in.bin_count - 1) && !found); j++) {
+        for (size_t j = 0; (j < bin_count - 1) && !found ; j++) {
-            if (min + j * bin_size <= x && (x < min + (j + 1) * bin_size)) {
+            if ((min + j * bin_size <= x) && (x < min + (j + 1) * bin_size)) {
                 bins[j] += 1;
                 found = true;
             }
         }
-        if (!found) bins[in.bin_count - 1]++;
+        if (!found) bins[bin_count - 1]++;
     }
+    return bins;
+}
+void
+show_histogram_text(vector<size_t> bins, size_t bin_count ){
     auto max_count = bins[0];
     for (auto x : bins) {
         if (x > max_count) {
             max_count = x;
         }
     }
-    for (i = 0; i < in.bin_count; i++) {
+    for (size_t i = 0; i < bin_count; i++) {
-        j = 100;
+        size_t j = 100;
         while (bins[i] < j) {
             cout << " ";
             j /= 10;
@@ -86,5 +88,11 @@ main() {
         }
         cout << endl;
     }
+}
+int
+main() {
+    Input in = input_data();
+    auto bins = make_histogram(in.numbers, in.bin_count);
+    show_histogram_text(bins, in.bin_count);
     return 0;
 }