code: point 2 add show_histogramm_text

main.cpp

@@ -3,10 +3,13 @@
 
 using namespace std;
 
+const size_t SCREEN_WIDTH = 80;
+const size_t MAX_ASTERISK = SCREEN_WIDTH - 3 - 1;
+
 struct 
 Input {
     vector<double> numbers;
-    size_t bin_count{};
+    int bin_count{};
 };
 
 Input 
@@ -18,7 +21,7 @@ input_data(){
     for (size_t i = 0; i < number_count; i++) {
         cin >> in.numbers[i];
     }
-    size_t bin_count;
+    int bin_count;
     cin >> in.bin_count;
     return in;
 }
@@ -41,35 +44,21 @@ find_minmax(const std::vector<double> &numbers, double &min, double &max){
 
 }
 
-int 
+std::vector<int>
-main()
+make_histogram(std::vector<double> numbers, size_t bin_count){
-{
-    
-    const size_t SCREEN_WIDTH = 80;
-    const size_t MAX_ASTERISK = SCREEN_WIDTH - 3 - 1;
-    Input in = input_data();
-    vector<size_t> bins(in.bin_count);
-
-
     double min;
     double max;
-    find_minmax(in.numbers, min, max);
+    vector<int> bins(bin_count);
-    
+    find_minmax(numbers, min, max);
-    size_t max_count;
+    double bin_size = (max - min) / bin_count;
-    for (int i =0; i<in.bin_count;i++){
+    for (size_t i = 0; i < numbers.size(); i++)
-        if (in.numbers[i]>max_count){
-            max_count=in.numbers[i];
-        }
-    }
-   double bin_size = (max - min) / in.bin_count;
-    for (size_t i = 0; i < in.numbers.size(); i++)
     {
         bool found = false;
-        for (size_t j = 0; (j < in.bin_count - 1) && !found; j++)
+        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 <= in.numbers[i]) && (in.numbers[i] < hi))
+            if ((lo <= numbers[i]) && (numbers[i] < hi))
             {
                 bins[j]++;
                 found = true;
@@ -78,20 +67,31 @@ main()
         }
         if (!found)
             {
-                bins[in.bin_count - 1]++;
+                bins[bin_count - 1]++;
             }
     }
+    return bins;
+}
+
+void
+show_histogramm_text(vector<int> bins, vector<double> numbers, size_t bin_count){
 
-    for (int i =0; i<in.bin_count;i++){
+    size_t max_count;
+    for (int i =0; i<bin_count;i++){
+        if (numbers[i]>max_count){
+            max_count=numbers[i];
+        }
+    }
+   
+
+    for (int i =0; i<bin_count;i++){
         if (bins[i]>max_count){
             max_count=bins[i];
         }
     }
 
-    //*cout<<max_count<<endl;
-
     if (max_count>MAX_ASTERISK){
-        for (int i=0; i<in.bin_count; i++){
+        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]<<"|";
@@ -117,7 +117,7 @@ main()
 
         }
     }else{
-        for (int i=0; i<in.bin_count; i++){
+        for (int i=0; i<bin_count; i++){
             if (bins[i]<10){
                 cout<<"  "<<bins[i]<<"|";
                 for (int j=0;j<bins[i];j++){
@@ -142,10 +142,19 @@ main()
 
         }
     }
-    for (int i =0; i< in.bin_count;i++){
+}
-        cout<<bins[i]<<" ";
+
-    }
+
-    return 0;
+int 
+main()
+{
+    
+    auto in = input_data();
+    auto bins = make_histogram(in.numbers, in.bin_count);
+    double min;
+    double max;
+    find_minmax(in.numbers, min, max);
+    show_histogramm_text(bins, in.numbers, in.bin_count);
 }