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

main.cpp

@@ -1,66 +1,67 @@
 #include <iostream>
 #include <vector>
-
-using namespace std;
-
-int main()
-{
-//   size_t SCREEN_WIDTH;
-    size_t number_count, kol_kor, height;
-    int i, j, srmax, srmin, maxp, minp, max_count = 0, count;
-    bool found;
+#include <math.h>
 
 
-    const size_t SCREEN_WIDTH = 80;
+using namespace std;
 
+    struct Input {
+    vector<double>numbers;
+    size_t kol_kor{};
+    };
 
-    cerr << "Enter number count:";
-    cin >> number_count;
-    const size_t MAX_ASTERISK = SCREEN_WIDTH - 3 - 1;
-/*
-    cerr << "Enter SCREEN_WIDTH:";
-    cin >> SCREEN_WIDTH;
-    while (SCREEN_WIDTH<7 || SCREEN_WIDTH>80 || SCREEN_WIDTH<number_count/3.0)
+Input
+input_data()
 {
-        cout<<"Error, incorrect SCREEN_WIDTH, please, re-enter\n";
-        cerr << "Enter SCREEN_WIDTH:";
-        cin >> SCREEN_WIDTH;
-    }
-*/
-    vector <double> numbers(number_count);
-    for (i = 0; i < number_count; i++)
+    size_t number_count;
+    cerr<<"Marks: ";
+    cin>>number_count;
+
+    Input in;
+    in.numbers.resize(number_count);
+     for (size_t i=0; i<number_count; i++)
     {
-        cerr << "numbers[" << i << "]";
-        cin >> numbers[i];
+        cerr<<"numbers["<<i<<"]=";
+        cin>>in.numbers[i];
     }
 
-    cerr << "Enter kol_kor:";
-    cin >> kol_kor;
-
-    vector<size_t> chet(kol_kor);
+    cerr<<"Kol_kor: ";
+    cin>>in.kol_kor;
+    return in;
+}
 
-    srmax = 0;
-    for (i = 0; i < number_count; i++)
+void find_minmax(const vector<double>& numbers, double& minp, double& maxp)
+{
+    minp = numbers[0];
+    for (auto i = 0; i<numbers.size(); i++)
+    {
+        if (numbers[i]<minp)
         {
-        if (numbers[i] > srmax)
-            srmax = numbers[i];
+            minp = numbers[i];
+        }
     }
-    maxp = srmax;
 
-    srmin = numbers[0];
-    for (i = 0; i < number_count; i++)
+    maxp = numbers[0];
+    for (auto i = 0; i<numbers.size(); i++)
+    {
+        if (numbers[i]>maxp)
         {
-        if (numbers[i] < srmin)
-            srmin = numbers[i];
+            maxp = numbers[i];
+        }
+    }
 }
-    minp = srmin;
-
-    double step = (maxp - minp) / (kol_kor*(1.0));
 
+vector <size_t> make_histogram (const vector<double>& numbers, size_t kol_kor)
+{
     vector<size_t>B(kol_kor);
-    for (i = 0; i < number_count; i++)
+    size_t max_count;
+    double maxp, minp;
+    find_minmax(numbers, minp, maxp);
+    double step = (maxp-minp)/(kol_kor);
+
+    for (size_t i=0; i<numbers.size(); i++)
     {
-        for (j = 0; j < kol_kor; j++)
+        for (size_t j=0; j<kol_kor; j++)
         {
             if ((numbers[i]>=(minp+j*step))&&(numbers[i]<(minp+(j+1)*step)))
             {
@@ -70,38 +71,29 @@ int main()
         }
     }
 
-    for (i = 0; i < number_count; i++)
+     for (size_t i=0; i<numbers.size(); i++)
     {
        if (numbers[i]== maxp)
-        {
         B[kol_kor-1]++;
     }
-
-    }
-    for (i = 0; i < kol_kor; i++)
-    {
-        if (B[i] > max_count)
-            max_count = B[i];
-    }
-    for (j = 0; j < kol_kor; j++)
-    {
-        cerr << "B[" << j << "]=";
-        cerr << B[j] << endl;
+    return B;
 }
 
-    for (i = 0; i < kol_kor; i++)
+void show_histogram(vector<size_t>B, size_t kol_kor)
+{   const size_t SCREEN_WIDTH = 80;
+         const size_t MAX_ASTERISK = SCREEN_WIDTH - 3 - 1;
+    for (size_t i=0; i<kol_kor; i++)
     {
-        if (B[i] > 9 && B[i] < 100)
+        if (B[i]<10)
         {
             cout<<"  ";
         }
-        if (B[i] < 10)
+        else if (B[i]<100)
         {
             cout<<" ";
         }
         cout<<B[i]<<"|";
-
-        if (max_count > MAX_ASTERISK)
+         if (int max_count > MAX_ASTERISK)
         {
             count = B[i];
             height = MAX_ASTERISK * (static_cast<double>(count) / max_count);
@@ -118,5 +110,14 @@ int main()
         }
         cout << endl;
     }
+    }
+}
+
+int main()
+{
+    Input in = input_data();
+    auto B = make_histogram(in.numbers, in.kol_kor);
+    show_histogram (B, in.kol_kor);
+
     return 0;
 }