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

main.cpp

@@ -1,14 +1,17 @@
 #include <iostream>
 #include <vector>
 #include <math.h>
+#include "histogram.h"
+#include "text.h"
 
 
 using namespace std;
 
-    struct Input {
+struct Input
+{
     vector<double>numbers;
     size_t kol_kor{};
-    };
+};
 
 Input
 input_data()
@@ -19,7 +22,7 @@ input_data()
 
     Input in;
     in.numbers.resize(number_count);
-     for (size_t i=0; i<number_count; i++)
+    for (size_t i=0; i<number_count; i++)
     {
         cerr<<"numbers["<<i<<"]=";
         cin>>in.numbers[i];
@@ -30,94 +33,15 @@ input_data()
     return in;
 }
 
-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)
-        {
-            minp = numbers[i];
-        }
-    }
 
-    maxp = numbers[0];
-    for (auto i = 0; i<numbers.size(); i++)
-    {
-        if (numbers[i]>maxp)
-        {
-            maxp = numbers[i];
-        }
-    }
-}
-
-vector <size_t> make_histogram (const vector<double>& numbers, size_t kol_kor)
-{
-    vector<size_t>B(kol_kor);
-    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 (size_t j=0; j<kol_kor; j++)
-        {
-            if ((numbers[i]>=(minp+j*step))&&(numbers[i]<(minp+(j+1)*step)))
-            {
-                B[j]++;
-                break;
-            }
-        }
-    }
 
-     for (size_t i=0; i<numbers.size(); i++)
-    {
-       if (numbers[i]== maxp)
-        B[kol_kor-1]++;
-    }
-    return B;
-}
-
-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]<10)
-        {
-            cout<<"  ";
-        }
-        else if (B[i]<100)
-        {
-            cout<<" ";
-        }
-        cout<<B[i]<<"|";
-         if (int max_count > MAX_ASTERISK)
-        {
-            count = B[i];
-            height = MAX_ASTERISK * (static_cast<double>(count) / max_count);
-        }
-
-        else
-        {
-            height = B[i];
-        }
-
-        for (j = 0; j < height; j++)
-        {
-            cout << "*";
-        }
-        cout << endl;
-    }
-    }
-}
 
 int main()
 {
     Input in = input_data();
     auto B = make_histogram(in.numbers, in.kol_kor);
-    show_histogram (B, in.kol_kor);
+    show_histogram_text(B, in.kol_kor);
 
     return 0;
 }