main.cpp

main.cpp

@@ -1,3 +1,5 @@
+#include "histogram.h"
+#include "text.h"
 #include <iostream>
 #include <vector>
 #include <math.h>
@@ -34,64 +36,8 @@ input_data() {
     return in;
 }
 
-void
-find_minmax(const 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<size_t>
-make_histogram(const vector<double>& numbers, size_t bin_count){
-
-    double min, max;
-    find_minmax(numbers, min, max);
-    double bin_size = (max - min) / bin_count;
-    vector<size_t> bins(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;
-}
-
-void
-show_histogram_text(const vector<size_t>& bins, size_t bin_count, float n){
-    if (n != 0){
-        cout << "bin count = " << bin_count;
-        if (n == 1)
-            cout << " using 1st" << '\n';
-        else
-            cout << " using 2nd" << '\n';}
-    for (size_t i = 0; i < bin_count; i++) {
-        if (bins[i]<100)
-            cout << " ";
-        if (bins[i]<10)
-            cout << " ";
-        cout << bins[i] << "|";
-        for (size_t j = 0; j < bins[i]; j++){
-            cout << "*";}
-        cout << '\n';}
-}
 int main()
 {