code: изменение кода до пункта 4

project/main.cpp

@@ -5,22 +5,31 @@ using namespace std;
 const size_t SCREEN_WIDTH = 80;
 const size_t MAX_ASTERISK = SCREEN_WIDTH - 3 - 1;
 
-int main()
-{
+struct Input {
+    vector<double> numbers;
+    size_t bin_count{};
+};
+
+Input
+input_data(){
     size_t number_count;
-    size_t bin_count;
     cerr << "Enter number count: ";
     cin >> number_count;
-    vector <double> numbers(number_count);
+    Input in;
+    in.numbers.resize(number_count);
     for(int i;i<number_count;i++)
     {
-        cin >> numbers[i];
+        cin >> in.numbers[i];
     }
     cerr << "Enter bin count: ";
-    cin >> bin_count;
-    vector <size_t> bins(bin_count);
-    double min = numbers[0];
-    double max = numbers[0];
+    cin >> in.bin_count;
+    return in;
+}
+
+void
+find_minmax(vector<double> numbers, double& min, double& max) {
+    min = numbers[0];
+    max = numbers[0];
     for (double x : numbers) {
     if (x < min) {
         min = x;
@@ -29,10 +38,16 @@ int main()
         max = x;
     }
 }
+}
+
+vector<size_t>
+make_histogram(vector<double> numbers, size_t bin_count) {
+    vector <size_t> bins(bin_count);
+    double min, max;
+    find_minmax(numbers, min, max);
     size_t countt;
-    size_t max_count = 0;
     double bin_size = (max - min) / 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++) {
         auto lo = min + j * bin_size;
@@ -46,10 +61,17 @@ int main()
         bins[bin_count - 1]++;
     }
     }
+        return bins;
+
+
+}
+
+void
+show_histogram_text(auto bins, size_t bin_count){
+        size_t max_count = 0;
         for (size_t i = 0; i < bin_count; i++){
         if(bins[i]>max_count)
         max_count = bins[i];
-
         }
     size_t height;
     for (size_t i = 0; i < bin_count; i++)
@@ -77,13 +99,12 @@ int main()
     }
 
 
-
-
-
-
-
-return 0;
-
-
-
+}
+
+
+int main()
+{   Input in = input_data();
+    auto bins = make_histogram(in.numbers, in.bin_count);
+    show_histogram_text(bins, in.bin_count);
+    return 0;
 }