diff --git a/main.cpp b/main.cpp index 5230b55..7eb0f81 100644 --- a/main.cpp +++ b/main.cpp @@ -1,5 +1,6 @@ #include #include +#include "histogram.h" using namespace std; const size_t SCREEN_WIDTH = 80; @@ -33,40 +34,6 @@ Input input_data() { return in; } -void find_minmax(const vector &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 make_histogram(const vector &numbers, size_t bin_count) { - double min = numbers[0]; - double max = numbers[0]; - find_minmax(numbers, min, max); - double bin_size = ( max - min ) / bin_count; - vector 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 &bins){ size_t maxbin = bins[0];