code: Измененный код

main.cpp

@@ -2,101 +2,114 @@
 #include <vector>
 using namespace std;
 
-int main(){
+struct Input {
-    const size_t SCREEN_WIDTH = 80;
+    vector<double> numbers;
-    const size_t MAX_ASTERISK = SCREEN_WIDTH - 3 - 1;
+    size_t bin_count{};
+};
 
+Input
+input_data() {
+    Input in;
+
+    cerr << "Enter number count: ";
     size_t number_count;
-   cerr << "enter number count";
     cin >> number_count;
 
-   vector<double> numbers(number_count);
+    in.numbers.resize(number_count);
-   cerr << "put elements with enter";
+    for (size_t i = 0; i < number_count; i++) {
-   for (int i = 0; i<number_count; i++){
+        cin >> in.numbers[i];
-        cin >> (numbers[i]);
     }
 
-   size_t bin_count;
+    cerr << "Enter number bin: ";
-   cerr << "enter bin count";
+    cin >> in.bin_count;
-   cin >> bin_count;
 
-   vector<size_t> bins(bin_count);
+    return in;
+}
 
-   double min = numbers[0];
+void find_minmax(const vector<double>& numbers, double& min, double& max) {
-   double max = numbers[0];
+    min = numbers[0];
-   for (double x: numbers){
+    max = numbers[0];
-        if (x < min){
+    for (double x : numbers)
+    {
+        if (x < min)
+        {
             min = x;
-        } else if (x > max) {
+        }
+        else if (x > max)
+        {
             max = x;
         }
     }
+}
+vector<size_t>
+make_histogram(const vector<double>& numbers, size_t bin_count) {
+    double min, max;
+    find_minmax(numbers, min, max);
 
-   double bin_size = (max - min)/bin_count;
+    vector<size_t> bins(bin_count);
+    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++){
+        for (size_t j = 0; (j < bin_count - 1) && !found; j++) {
-            auto lo = min+j*bin_size;
+            auto lo = min + j * bin_size;
-            auto hi = min+(j+1)*bin_size;
+            auto hi = min + (j + 1) * bin_size;
-            if ((lo <= numbers[i]) && (numbers[i] < hi)){
+            if ((lo <= numbers[i]) && (numbers[i] < hi)) {
                 bins[j]++;
                 found = true;
             }
         }
-        if (!found){
+        if (!found) {
-            bins[bin_count-1]++;
+            bins[bin_count - 1]++;
-        }
         }
-
-    size_t max_count = bins[0];
-   double widght = bins[0];
-   for (double x: bins){
-      if (x > widght) {
-            widght = x;
     }
-   }
+    return bins;
-    cout << "+";
+}
-    for (int i=0; i<widght+5; i++){
-        cout << "-";
-    }
-    cout << "+" << endl;
 
-    for (int i = 0; i<bin_count; i++){
+void show_histogram_text(const vector<size_t>& bins, size_t max_count, size_t MAX_ASTERISK, size_t bin_count){
-        if (bins[i] > max_count){
+     for (size_t i = 0; i < bin_count; i++){
-            max_count = bins[i];
+        if (bins[i]<10) {
-        }
+            cout << "  " << bins[i] << "|";
             }
-        for (int i = 0; i<bin_count; i++){
+        else if (bins[i]<100) {
-        if (bins[i] < 10){
+            cout << " " << bins[i] << "|";
-                cout << "|" << "  " << bins[i] << "|";}
-        else if (bins[i]>=10 && bins[i]<100){
-             cout << "|" << " " << bins[i] << "|";
         }
-        else if (bins[i]>=100 && bins[i]<1000){
+        else if (bins[i]<1000) {
-             cout << "|" << bins[i] << "|";
+            cout << bins[i] << "|";
         }
 
         size_t height;
-        if (max_count <= MAX_ASTERISK){
+
+        if (max_count<=MAX_ASTERISK) {
             height = bins[i];
         }
-        else{
+        else {
-            height = MAX_ASTERISK*(static_cast<double>(bins[i])/max_count);
+            height = MAX_ASTERISK * (static_cast<double>(bins[i]) / max_count);
         }
-        for (int j = 0; j<height; j++){
+        for (size_t j = 0; j < height; j++) {
             cout << "*";
         }
-            cout << " " << "|";
         cout << endl;
     }
 
-    cout << "+";
+}
-    for (int i=0; i<widght+5; i++){
+
-        cout << "-";
+int main()
-    }
+{
-    cout << "+" << endl;
+    const size_t SCREEN_WIDTH = 80;
+    const size_t MAX_ASTERISK = SCREEN_WIDTH - 3 - 1;
+
+    auto in = input_data();
+    auto bins = make_histogram(in.numbers, in.bin_count);
 
 
+    size_t max_count = bins[0];
+    for (size_t i = 0; i < bins.size(); i++) {
+        if (bins[i] > max_count) {
+            max_count = bins[i];
+        }
+    }
+    show_histogram_text(bins, max_count, MAX_ASTERISK, in.bin_count);
+
     return 0;
 }