diff --git a/histogram.cpp b/histogram.cpp new file mode 100644 index 0000000..728e7a3 --- /dev/null +++ b/histogram.cpp @@ -0,0 +1,52 @@ +#include +#include +#include "histogram.h" +using namespace std; + +void static find_minmax(const vector &numbers, double &min, double &max) +{ + min = numbers[0]; + max = numbers[0]; + for(double number : numbers) + { + if(number < min) + { + min = number; + } + if(number > max) + { + max = number; + } + } + return; + +} + +std::vector make_histogram(std::vector& numbers, size_t bin_count) +{ + + double min; + double max; + 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; +} diff --git a/histogram.h b/histogram.h new file mode 100644 index 0000000..c68033a --- /dev/null +++ b/histogram.h @@ -0,0 +1,7 @@ +#ifndef HISTOGRAM_H_INCLUDED +#define HISTOGRAM_H_INCLUDED +#include + +std::vector make_histogram(std::vector& numbers, size_t bin_count); + +#endif // HISTOGRAM_H_INCLUDED diff --git a/main.cpp b/main.cpp index 83abf99..c30f1fb 100644 --- a/main.cpp +++ b/main.cpp @@ -1,6 +1,6 @@ #include #include - +#include "histogram.h" using namespace std; struct Input { @@ -25,48 +25,8 @@ input_data(){ return in; } -void find_minmax(const vector &numbers, double &min, double &max){ - min = numbers[0]; - max = numbers[0]; - for(double number : numbers) - { - if(number < min) - { - min = number; - } - if(number > max) - { - max = number; - } - } - return; -} -vector make_histogram (vector numbers, size_t bin_count){ - double min; - double max; - 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(vector bins, size_t bin_count){ const size_t SCREEN_WIDTH = 80; const size_t MAX_ASTERISK = SCREEN_WIDTH - 3 - 1;