code: новый код

main.cpp

@@ -1,5 +1,7 @@
 #include <iostream>
 #include <vector>
+#include "histogram.h"
+#include "text.h"
 
 using namespace std;
 
@@ -25,71 +27,11 @@ input_data() {
     cin >> in.bin_count;
     return in;
 }
-void
-find_minmax(vector<double> numbers, double& min, double& max) {
-    min = numbers[0];
-    max = numbers[0];
-    for (double x : numbers)
-    {
 
-        if(x < min){min = x;}
-        else if (x > max){max = x;}
-    }}
-vector <double> make_histogram(const vector<double>& numbers, size_t bin_count){
-    vector<double> bins (bin_count);
-    double min = 0;
-    double max = 0;
-    find_minmax(numbers, min, max);
-    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;}
-
-show_histogram_text (const vector<double>& bins, size_t MAX_ASTERISK, size_t bin_count){
-    size_t bin_max = 0;
-    size_t height = 0;
-    for (double y : bins)
-    {
-        if (y > bin_max){bin_max = y;}
-    }
-    for (size_t bin: bins)
-    {
-        size_t height = bin;
-        height = MAX_ASTERISK * (static_cast<double>(bin) / bin_max);
-        if (bin < 100)
-        {
-            cout << " ";
-        }
-        if (bin < 10)
-        {
-            cout << " ";
-        }
-        cout << bin << "|";
-        for (size_t i = 0; i < height; i++)
-        {
-            cout << "*";
-        }
-        cout << endl;
-    }
-}
 
 int main(){
-    const size_t SCREEN_WIDTH = 80;
-    const size_t MAX_ASTERISK = SCREEN_WIDTH - 3 - 1;
     auto in = input_data();
     auto bins = make_histogram(in.numbers, in.bin_count);
-    show_histogram_text(bins, MAX_ASTERISK, in.bin_count );
+    show_histogram_text(bins);
        return 0;
 }