code: структурирование программы

main.cpp

@@ -2,28 +2,34 @@
 #include <vector>
 
 using namespace std;
-int main()
+struct Input
+{
+    vector<double> numbers;
+    size_t bin_count{};
+};
+Input
+input_data()
 {
-    const size_t SCREEN_WIDTH = 80;
-    const size_t MAX_ASTERISK = SCREEN_WIDTH - 3 - 1;
     size_t number_count;
     cerr << "Enter number count: ";
     cin >> number_count;
-    vector<double> numbers(number_count);
+    Input in;
+    cerr << "Enter number of bins: ";
+    cin >> in.bin_count;
 
-    for(size_t i=0; i < number_count; i++)
+    in.numbers.resize(number_count);
+    cerr << "Enter numbers: ";
+    for (size_t i = 0; i < number_count; i++)
     {
-        cin >> numbers[i];
+        cin >> in.numbers[i];
     }
-
-    size_t bin_count;
-    cerr << "Enter bin count: ";
-    cin >> bin_count;
-    vector<size_t> bins (bin_count);
-
-    double min = numbers[0];
-    double max = numbers[0];
-
+    return in;
+}
+void
+find_minmax(const vector<double> &numbers, double &min, double &max)
+{
+    min = numbers[0];
+    max = numbers[0];
     for (double x : numbers)
     {
         if (x < min)
@@ -35,10 +41,16 @@ int main()
             max = x;
         }
     }
-
+}
+vector<size_t> make_histogram(const vector<double> &numbers, size_t bin_count)
+{
+    double min = numbers[0];
+    double max = numbers[0];
+    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++)
@@ -56,9 +68,15 @@ int main()
             bins[bin_count - 1]++;
         }
     }
-
-    int max_count = 0;
-    for (size_t i = 0; i < bin_count; i++)
+    return bins;
+}
+void
+show_histogram_text(const vector <size_t> &bins)
+{
+    const size_t SCREEN_WIDTH = 80;
+    const size_t MAX_ASTERISK = SCREEN_WIDTH - 3 - 1;
+    int max_count = bins[0];
+    for (size_t i = 0; i < bins.size(); i++)
     {
         if (bins[i] > max_count)
         {
@@ -67,7 +85,7 @@ int main()
     }
     if (max_count > MAX_ASTERISK)
     {
-        for (int i = 0; i < bin_count; i++)
+        for (int i = 0; i < bins.size(); i++)
         {
             size_t height = MAX_ASTERISK * (static_cast<double>(bins[i]) / max_count);
             if (bins[i] < 100)
@@ -89,7 +107,7 @@ int main()
 
     else
     {
-        for (int i = 0; i < bin_count; i++)
+        for (int i = 0; i < bins.size(); i++)
         {
             if (bins[i] < 100)
             {
@@ -109,5 +127,17 @@ int main()
     }
 }
 
+int
+main()
+{
+    auto in = input_data();
+    auto bins = make_histogram(in.numbers, in.bin_count);
+    show_histogram_text(bins);
+}
+
+
+
+
+