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

main.cpp

@@ -2,80 +2,107 @@
 #include <vector>
 using namespace std;
 
-int main()
+struct Input{
+    vector<double> numbers;
+    size_t bin_count{};
+};
+Input
+input_data()
 {
-    size_t number_count, bin_count;
-    const size_t SCREEN_WIDTH = 80;
-    const size_t MAX_ASTERISK = SCREEN_WIDTH - 3 - 1;
-
-    cerr << "Enter number count: ";
+    Input in;
+    size_t number_count;
     cin >> number_count;
+    in.numbers.resize(number_count);
 
     vector<double> numbers(number_count);
-
-    cerr <<"Numbers: ";
     for (size_t i=0; i< number_count; i++) {
-        cin >> numbers[i];
+        cin >> in.numbers[i];
     }
-    cerr << "Enter bin count: ";
-    cin >> bin_count;
+    cin >> in.bin_count;
+    return in;
+}
 
-    vector<size_t> bins(bin_count);
-
-    double min = numbers[0];
-    double max = numbers[0];
-        for (double x : numbers) {
-            if (x < min) {
-                min = x;
+void find_minmax(const vector<double>& numbers, double& minN, double& maxN){
+    minN = numbers[0];
+    maxN = numbers[0];
+    for (double x : numbers){
+        if (x < minN){
+            minN = x;
         }
-            else if (x > max) {
-                max = x;
+        else if (x > maxN) {
+            maxN = x;
         }
     }
+}
 
-    double bin_size = (max - min) / bin_count;
-
+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;
-
-    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)) {
+        for (size_t j = 0; (j < bin_count - 1) && !found; j++){
+            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) {
+                if (bins[j] > max_count){
                     max_count = bins[j];
                 }
                 found = true;
             }
         }
-      if (!found) {
+        if(!found){
                 bins[bin_count - 1]++;
-         if (bins[bin_count - 1] > max_count) {
+                if (bins[bin_count - 1] > max_count){
                     max_count = bins[bin_count - 1];
                 }
             }
+    }
+    return bins;
 }
- for (size_t i = 0; i < bin_count; i++) {
-        size_t height = 0;
 
-        if (max_count > MAX_ASTERISK) {
-            height = static_cast<size_t>(MAX_ASTERISK * static_cast<double>(bins[i]) / max_count);
+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;
     }
-         else {
-            height = bins[i];
+    for (size_t i = 0; i < bin_count; i++){
+        if (bins[i] < 10){
+            cout << "  ";
         }
-       if (bins[i] < 10) {
-            cout << "  " << bins[i] << "|";
-        } else if (bins[i] < 100) {
-            cout << " " << bins[i] << "|";
-        } else {
-            cout << bins[i] << "|";
+        else if (bins[i] < 100){
+            cout << " ";
         }
-        for (size_t j = 0; j < height; j++) {
-            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);
+}