все изменения до пункта 4

main.cpp

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