code: добавление функций

main.cpp

@@ -4,28 +4,31 @@
 
 using namespace std;
 
-int main()
+struct Input
 {
-    int i, j;
+    vector<double> numbers;
-    size_t number_count;
+    size_t bin_count{};
-    const size_t screen_width = 80;
+};
-    const size_t max_asterisk = screen_width - 3 - 1;
 
-    cerr << "Enter number count : ";
+Input input_data()
+{
+    size_t number_count;
+    cerr<<"Enter number count: ";
     cin >> number_count;
-    vector <double> numbers(number_count);
+    Input in;
-    cerr << "Enter numbers : " << endl;
+    in.numbers.resize(number_count);
-    for (i = 0; i < number_count; i++)
+    for (size_t i =0; i < number_count; i++)
     {
-        cin >> numbers[i];
+        cin >> in.numbers[i];
     }
-    size_t bin_count;
+    cerr<< "Enter bin count: ";
-    cerr << "Enter bin count : ";
+    cin >> in.bin_count;
-    cin >> bin_count;
+    return in;
-    vector <size_t> bins(bin_count);
+}
-
+void find_minmax(const vector<double> &numbers, double &min, double &max)
-    double min = numbers[0];
+{
-    double max = numbers[0];
+    min = numbers[0];
+    max = numbers[0];
        for (double x : numbers)
     {
         if (x < min)
@@ -37,10 +40,19 @@ int main()
             max = x;
         }
     }
+    return;
+}
+
+vector<size_t> make_histogram (vector<double> numbers, size_t bin_count)
+{
 
+    double min;
+    double 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++)
@@ -49,16 +61,25 @@ int main()
             auto hi = min + (j + 1) * bin_size;
             if ((lo <= numbers[i]) && (numbers[i] < hi))
             {
-                bins[j] ++;
+                bins[j]++;
                 found = true;
             }
         }
+
         if (!found)
         {
             bins[bin_count - 1]++;
         }
     }
 
+    return bins;
+}
+
+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;
+    size_t i,j;
     double max_count;
     max_count = bins[0];
     for (i=0; i< bin_count; i++)
@@ -101,6 +122,14 @@ int main()
         }
         cout << endl;
     }
-    _getch();
+}
+
+
+int main()
+{
+    auto in = input_data();
+    auto bins = make_histogram(in.numbers, in.bin_count);
+    show_histogram_text(bins, in.bin_count);
+    getch();
     return 0;
 }