diff --git a/histogram.cpp b/histogram.cpp new file mode 100644 index 0000000..bac09a3 --- /dev/null +++ b/histogram.cpp @@ -0,0 +1,55 @@ +#include +#include +#include "histogram.h" + +void find_minmax(const std::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; + } + } +} + +std::vector make_histogram(const std::vector& numbers, size_t bin_count) +{ + std::vector bins(bin_count); + int max_count = bins[0]; + double min = numbers[0]; + double max = numbers[0]; + + find_minmax(numbers, min, max); + double bin_size = (max - min) / 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; +} \ No newline at end of file diff --git a/histogram.h b/histogram.h new file mode 100644 index 0000000..007d1a0 --- /dev/null +++ b/histogram.h @@ -0,0 +1,8 @@ +#ifndef HISTOGRAM_H_INCLUDED +#define HISTOGRAM_H_INCLUDED +#include + +std::vector +make_histogram(const std::vector& numbers, size_t bin_count); + +#endif // HISTOGRAM_H_INCLUDED diff --git a/lab34.cpp b/lab34.cpp index b151911..43b90b9 100644 --- a/lab34.cpp +++ b/lab34.cpp @@ -1,5 +1,8 @@ #include #include +#include "histogram.h" +#include "text.h" + using namespace std; @@ -36,99 +39,6 @@ Input input_data() return in; } -void find_minmax(const vector &numbers, double &min, double &max) -{ - min = 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) -{ - vector bins(bin_count); - int max_count = bins[0]; - double min = numbers[0]; - double max = numbers[0]; - - find_minmax(numbers, min, max); - double bin_size = (max - min) / 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) -{ - int max_count = bins[0]; - for (int i = 0; i < bin_count; i++) - { - if (bins[i] > max_count) - { - max_count = bins[i]; - } - } - vector height(bin_count); - for (int i = 0; i < bin_count; i++) - { - if (bins[i] > MAX_ASTERISK) - { - height[i] = (MAX_ASTERISK * bins[i]) / max_count; - } - else - height[i] = bins[i]; - } - - for (int i = 0; i < bin_count; i++) - { - - if (bins[i] < 100) - { - cout << " "; - } - - if (bins[i] < 10) - { - cout << " "; - } - - cout << bins[i] << "|"; - - for (int j = 0; j < height[i]; j++) - { - cout << "*"; - } - cout << endl; - } -} - int main() { auto in = input_data(); diff --git a/text.cpp b/text.cpp new file mode 100644 index 0000000..bc497ba --- /dev/null +++ b/text.cpp @@ -0,0 +1,51 @@ +#include +#include +#include "text.h" + +const size_t SCREEN_WIDTH = 80; +const size_t MAX_ASTERISK = SCREEN_WIDTH - 3 - 1; + + +void show_histogram_text(std::vector &bins, size_t bin_count) +{ + int max_count = bins[0]; + for (int i = 0; i < bin_count; i++) + { + if (bins[i] > max_count) + { + max_count = bins[i]; + } + } + std::vector height(bin_count); + for (int i = 0; i < bin_count; i++) + { + if (bins[i] > MAX_ASTERISK) + { + height[i] = (MAX_ASTERISK * bins[i]) / max_count; + } + else + height[i] = bins[i]; + } + + for (int i = 0; i < bin_count; i++) + { + + if (bins[i] < 100) + { + std::cout << " "; + } + + if (bins[i] < 10) + { + std::cout << " " ; + } + + std::cout << bins[i] << "|"; + + for (int j = 0; j < height[i]; j++) + { + std::cout << "*"; + } + std::cout << std::endl; + } +} \ No newline at end of file diff --git a/text.h b/text.h new file mode 100644 index 0000000..d7d9fc2 --- /dev/null +++ b/text.h @@ -0,0 +1,8 @@ +#ifndef TEXT_H_INCLUDED +#define TEXT_H_INCLUDED +#include + +void +show_histogram_text(std::vector &bins, size_t bin_count); + +#endif // TEXT_H_INCLUDED