diff --git a/histogram.cpp b/histogram.cpp index e69de29..350f5c1 100644 --- a/histogram.cpp +++ b/histogram.cpp @@ -0,0 +1,51 @@ +#include +#include +#include +#include +#include "histogram.h" +using namespace std; + +static +find_minmax(vector numbers, double &min, double &max) { + min = numbers[0]; + max = numbers[0]; + for (size_t i = 1; i < numbers.size(); i++) { + if (min > numbers[i]) + min = numbers[i]; + if (max < numbers[i]) + max = numbers[i]; + } +} + +vector make_histogramm(vectornumbers, size_t bin_count){ + double min, max; + find_minmax(numbers, min, max); + double binSize = (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 * binSize; + auto hi = min + (j + 1) * binSize; + if ((numbers[i] >= lo) && (numbers[i] < hi)) { + bins[j]++; + found = true; + } + } + if (!found) + bins[bin_count - 1]++; + } + int max_count = bins[0]; + for (size_t i = 0; i < bin_count; i++) { + if (bins[i] > max_count) + max_count = bins[i]; + } + if (max_count > 76) { + for (size_t i = 0; i < bin_count; i++) { + int count = bins[i]; + size_t height = 76 * (static_cast(count) / max_count); + bins[i] = height; + } + } + return bins; +} diff --git a/histogram.h b/histogram.h index e69de29..a857690 100644 --- a/histogram.h +++ b/histogram.h @@ -0,0 +1,10 @@ +#ifndef HISTOGRAM_H_INCLUDED +#define HISTOGRAM_H_INCLUDED + +#include + +std::vector +make_histogramm(std::vector numbers, size_t bin_count); + + +#endif // HISTOGRAM_H_INCLUDED diff --git a/main.cpp b/main.cpp index 292129f..54e383c 100644 --- a/main.cpp +++ b/main.cpp @@ -2,6 +2,8 @@ #include #include #include +#include "histogram.h" +#include "text.h" using namespace std; struct Input { @@ -25,61 +27,6 @@ input_data(){ return in; } -void -find_minmax(vector numbers, double &min, double &max) { - min = numbers[0]; - max = numbers[0]; - for (size_t i = 1; i < numbers.size(); i++) { - if (min > numbers[i]) - min = numbers[i]; - if (max < numbers[i]) - max = numbers[i]; - } - return; -} - -vector make_histogramm(vectornumbers, size_t bin_count){ - double min, max; - find_minmax(numbers, min, max); - double binSize = (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 * binSize; - auto hi = min + (j + 1) * binSize; - if ((numbers[i] >= lo) && (numbers[i] < hi)) { - bins[j]++; - found = true; - } - } - if (!found) - bins[bin_count - 1]++; - } - int max_count = bins[0]; - for (size_t i = 0; i < bin_count; i++) { - if (bins[i] > max_count) - max_count = bins[i]; - } - if (max_count > 76) { - for (size_t i = 0; i < bin_count; i++) { - int count = bins[i]; - size_t height = 76 * (static_cast(count) / max_count); - bins[i] = height; - } - } - return bins; -} - -void show_histogramm(vectorbins){ - for (size_t i = 0; i < bins.size(); i++) { - cout << bins[i] << "|"; - for (size_t j = 0; j < bins[i]; j++) - cout << "*"; - cout << endl; - } - return; -} int main() { Input in = input_data(); diff --git a/text.cpp b/text.cpp index e69de29..fb02f93 100644 --- a/text.cpp +++ b/text.cpp @@ -0,0 +1,16 @@ +#include +#include +#include +#include +#include "text.h" + +using namespace std; +void show_histogramm(vectorbins){ + for (size_t i = 0; i < bins.size(); i++) { + cout << bins[i] << "|"; + for (size_t j = 0; j < bins[i]; j++) + cout << "*"; + cout << endl; + } + return; +} diff --git a/text.h b/text.h index e69de29..91069d3 100644 --- a/text.h +++ b/text.h @@ -0,0 +1,8 @@ +#ifndef TEXT_H_INCLUDED +#define TEXT_H_INCLUDED + +#include + +void show_histogramm(std::vectorbins); + +#endif // TEXT_H_INCLUDED