3 (4).2: and modified main.cpp file

main.cpp

@@ -1,6 +1,8 @@
 #include <iostream>
 #include <vector>
 #include <cmath>
+#include "histogram.h"
+#include "text.h"
 using namespace std;
 
 const size_t SCREEN_WIDTH = 80;
@@ -30,77 +32,6 @@ input_data() {
     return in;
 }
 
-void find_minmax(const vector<double>& numbers, double& mini, double& maxi) {
-
-    mini = numbers[0];
-    maxi = numbers[0];
-    for (double x : numbers) {
-        if (x < mini) {
-            mini = x;
-        }
-        else if (x > maxi) {
-            maxi = x;
-        }
-    }
-}
-
-vector<size_t>
-make_histogram(const vector<double>& numbers, int bin_count) {
-    double mini, maxi;
-    find_minmax(numbers, mini, maxi);
-
-    vector<size_t> bins(bin_count);
-
-    double bin_size = (maxi - mini) / bin_count;
-    for (double num : numbers) {
-        bool found = false;
-        for (size_t j = 0; (j < bin_count - 1) && !found; j++){
-            auto lo = mini + j * bin_size;
-            auto hi = mini + (j + 1) * bin_size;
-            if ((lo <= num) && (num < hi)) {
-                bins[j]++;
-                found = true;
-            }
-        }
-        if (!found) {
-            bins[bin_count - 1]++;
-        }
-    }
-
-    return bins;
-}
-
-void show_histogram_text(const vector<size_t>& bins, size_t bin_count) {
-    size_t max_count = bins[0];
-    for (size_t i = 0; i < bin_count; i++) {
-        if (bins[i] > max_count) {
-            max_count = bins[i];
-        }
-    }
-
-    vector<size_t> height(bin_count);
-    for (size_t i = 0; i < bin_count; i++) {
-        if (max_count > MAX_ASTERISK) {
-            height[i] = round(MAX_ASTERISK * (static_cast<double>(bins[i]) / max_count));
-        } else {
-            height[i] = bins[i];
-        }
-    }
-
-    for (size_t i = 0; i < bin_count; i++) {
-        if (bins[i] < 10) {
-            cout << "  ";
-        } else if (bins[i] < 100) {
-            cout << " ";
-        }
-        cout << bins[i] << "| ";
-
-        for (size_t j = 0; j < height[i]; j++) {
-            cout << " * ";
-        }
-        cout << endl;
-    }
-}
 
 int main() {
     auto in = input_data();