diff --git a/main.cpp b/main.cpp index 487ac3c..edd6ece 100644 --- a/main.cpp +++ b/main.cpp @@ -1,6 +1,6 @@ #include #include - +#include "histogram.h" using namespace std; @@ -22,41 +22,6 @@ 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 bucket, size_t number_count) { - vector stolb(bucket); - double min, max; - find_minmax (numbers, min, max); - float k = (max-min)/bucket; - for (size_t i = 0; i < bucket; i++) stolb[i] = 0; - for (size_t i = 0; i < number_count; i++) - { - bool flag = false; - for (size_t j = 0; (j < bucket && !flag); j++) - { - if (numbers[i] >= (min+k*j) && numbers[i] < (min+k*(1+j))) - { - stolb[j]++; - flag = true; - - } - } - if (!flag) stolb[bucket-1]++; - } - return stolb; -} - void show_histogram_text(vector stolb, size_t bucket) { const size_t SCREEN_WIDTH = 80; @@ -83,7 +48,6 @@ show_histogram_text(vector stolb, size_t bucket) { cout << "\n"; }} - int main() {