Пункт 2: структурирование программы при помощи функций

lab01.cbp

@@ -32,6 +32,7 @@
 			<Add option="-Wall" />
 			<Add option="-fexceptions" />
 		</Compiler>
+		<Unit filename=".gitignore" />
 		<Unit filename="main.cpp" />
 		<Extensions />
 	</Project>

main.cpp

@@ -3,71 +3,65 @@
 
 using namespace std;
 
-const size_t SCREEN_WIDTH = 80;
-const size_t MAX_ASTERISK = SCREEN_WIDTH - 3 - 1;
-
-void indent(int number)
+struct Input
 {
-    if (number < 10)
-    {
-        cout << "  ";
-    }
-    else if (number < 100)
-    {
-        cout << " ";
-    }
-    else
-    {
-        cout << "";
-    }
-}
+    vector<double> numbers;
+    size_t bin_count{};
+};
 
-int main()
+Input
+input_data()
 {
+    Input in;
     size_t number_count;
-    cerr << "Enter number count: ";
     cin >> number_count;
+    in.numbers.resize(number_count);
 
     vector<double> numbers(number_count);
 
     for (size_t i = 0; i < number_count; i++)
     {
-        cerr << "Enter numbers: ";
-        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);
+void find_minmax( const vector<double>& numbers, double& minN, double& maxN)
+{
+    minN = numbers[0];
+    maxN = numbers[0];
 
-    double min = numbers[0];
-    double max = numbers[0];
-
-    for (double x : numbers)
+    for (double x: numbers)
     {
-        if (x < min)
+        if (minN > x)
         {
-            min = x;
+            minN = x;
         }
-        else if (x > max)
+        if (maxN < x)
         {
-            max = x;
+            maxN = x;
         }
     }
+}
 
+vector<size_t> make_histogram(const vector<double>& numbers, size_t bin_count)
+{
+    double minN, maxN;
+    find_minmax( numbers, minN, maxN);
+
+    vector <size_t> bins(bin_count);
+    double diff = (maxN - minN) / bin_count;
     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;
-            auto hi = min + (j + 1) * bin_size;
-            if ((lo <= numbers[i]) && (numbers[i] < hi))
+            auto lo = minN + j * diff;
+            auto hi = minN + (j + 1) * diff;
+            if ((lo <= numbers[i]) && (hi > numbers[i]))
             {
                 bins[j]++;
                 if (bins[j] > max_count)
@@ -77,7 +71,7 @@ int main()
                 found = true;
             }
         }
-        if (!found)
+        if(!found)
         {
             bins[bin_count - 1]++;
             if (bins[bin_count - 1] > max_count)
@@ -86,35 +80,63 @@ int main()
             }
         }
     }
-
-    if (max_count <= 76)
-    {
-        for (size_t i = 0; i < bin_count; i++)
-        {
-            indent(bins[i]);
-            cout << bins[i] << "|";
-            for (size_t j = 0; j < bins[i]; j++)
-            {
-                cout << "*";
-            }
-            cout << endl;
-        }
-    }
-
-    else
-    {
-        for (size_t i = 0; i < bin_count; i++)
-        {
-            size_t height = 76 * (static_cast<double>(bins[i]) / max_count);
-            indent(bins[i]);
-            cout << bins[i] << "|";
-            for (size_t j = 0; j < height; j++)
-            {
-                cout << "*";
-            }
-            cout << endl;
-        }
-    }
-    return 0;
-
+    return bins;
+}
+
+void show_histogram_text(const vector <size_t>& bins,size_t bin_count, size_t max_count)
+{
+    const size_t SCREEN_WIDTH = 80;
+    const size_t MAX_ASTERISK = SCREEN_WIDTH - 3 - 1;
+
+    bool scaling = false;
+
+    if (max_count > MAX_ASTERISK)
+    {
+        scaling = true;
+    }
+
+    for (size_t i = 0; i < bin_count; i++)
+    {
+        if (bins[i] < 10)
+        {
+            cout << "  ";
+        }
+        else if (bins[i] < 100)
+        {
+            cout << " ";
+        }
+        else
+        {
+            cout << "";
+        }
+        cout << bins[i] << '|';
+
+        size_t number_of_stars = bins[i];
+
+        if (scaling)
+        {
+            if (bins[i] == max_count)
+            {
+                number_of_stars = MAX_ASTERISK * 1.0;
+            }
+            else
+            {
+                number_of_stars = MAX_ASTERISK * (static_cast<double>(bins[i]) / max_count);
+            }
+        }
+
+        for (size_t j = 0; j < number_of_stars; j++)
+        {
+            cout << '*';
+        }
+        cout << endl;
+    }
+}
+
+int main()
+{
+    size_t max_count;
+    auto in = input_data();
+    auto bins = make_histogram(in.numbers, in.bin_count);
+    show_histogram_text(bins, in.bin_count, max_count);
 }