code: программа разбита на структуры и функции

project/.gitignore

@@ -0,0 +1,5 @@
+/bin
+/obj
+lab34.depend
+lab34.layout
+main.exe

project/main.cpp

@@ -2,21 +2,36 @@
 #include <vector>
 using namespace std;
 
-int main()
-{
-    const size_t SCREEN_WIDTH = 80;
-    const size_t MAX_ASTERISK = SCREEN_WIDTH - 3 - 1;
+struct Input {
+    vector<double> numbers;
+    size_t bin_count{};
+};
+
+Input
+input_data() {
+    Input in;
+
+    size_t number_count;
+    cerr << "Enter quantity of numbers: ";
+    cin >> number_count;
 
-    size_t number_count, bin_count, i, bin;
-    cerr << "Enter number count: " << endl;
-    cin>>number_count;
     vector<double> numbers(number_count);
-    cerr<< "Enter numbers: "<<endl;
-    for (size_t i = 0; i < number_count; i++){
-        cin>>numbers[i];
+    in.numbers.resize(number_count);
+    cerr << "Enter numbers: ";
+    for (size_t i = 0; i < number_count; i++) {
+        cin >> in.numbers[i];
     }
-    double min = numbers[0];
-    double max = numbers[0];
+
+    cerr << "Enter bin count: ";
+    cin >> in.bin_count;
+
+    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) {
             min = x;
@@ -25,13 +40,18 @@ int main()
             max = x;
         }
     }
+}
+
+vector <size_t>
+make_histogram(const vector<double> numbers, size_t bin_count) {
+    double min;
+    double max;
+
+    find_minmax(numbers, min, max);
 
-    cerr<< "Enter bin count: "<<endl;
-    cin>>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++) {
             auto lo = min + j * bin_size;
@@ -43,22 +63,78 @@ int main()
         }
         if (!found) {
             bins[bin_count - 1]++;
-            }
+        }
     }
-    size_t height = 0;
-    size_t max_count = 0;
-    for (i = 0; i < bin_count; i++){
-        if (bins[i] > max_count) max_count = bins[i];
+    return bins;
+}
+
+void show_histogram_text(const vector<size_t> bins, size_t bin_count) {
+    const size_t SCREEN_WIDTH = 80;
+    const size_t MAX_ASTERISK = SCREEN_WIDTH - 3 - 1;
+
+    int max_count = 0;
+    for (int i =0; i<bin_count;i++){
+        if (bins[i]>max_count){
+            max_count=bins[i];
+        }
+    }
+    if (max_count>MAX_ASTERISK){
+        for (int i=0; i<bin_count; i++){
+            size_t height = MAX_ASTERISK * (static_cast<double>(bins[i]) / max_count);
+            if (bins[i]<10){
+                cout<<"  "<<bins[i]<<"|";
+                for (int j=0;j<height;j++){
+                    cout<<"*";
+                }
+                cout<<endl;
+            }
+            else if(bins[i]<100){
+                cout<<" "<<bins[i]<<"|";
+                for (int j=0;j<height;j++){
+                    cout<<"*";
+                }
+                cout<<endl;
+            }
+            else{
+                cout<<bins[i]<<"|";
+                for (int j=0;j<height;j++){
+                    cout<<"*";
+                }
+                cout<<endl;
+            }
+
     }
-    for(size_t bin:bins){
-        size_t height = bin;
-        height = MAX_ASTERISK * (static_cast<double>(bin) / max_count);
-        if(bin<100) cout<<" ";
-        if(bin<10) cout<<" ";
-        cout<<bin<<"|";
-        for(size_t i = 0; i < height; i++){
-            cout<<"*";
+    }else{
+        for (int i=0; i<bin_count; i++){
+            if (bins[i]<10){
+                cout<<"  "<<bins[i]<<"|";
+                for (int j=0;j<bins[i];j++){
+                    cout<<"*";
+                }
+                cout<<endl;
+            }
+            else if(bins[i]<100){
+                cout<<" "<<bins[i]<<"|";
+                for (int j=0;j<bins[i];j++){
+                    cout<<"*";
+                }
+            cout<<endl;
+            }
+            else{
+                cout<<bins[i]<<"|";
+                for (int j=0;j<bins[i];j++){
+                    cout<<"*";
+                }
+                cout<<endl;
+            }
+
         }
-        cout<<endl;
     }
 }
+
+int
+main(){
+    auto in = input_data();
+    auto bins = make_histogram(in.numbers, in.bin_count);
+    show_histogram_text(bins, in.bin_count);
+}