diff --git a/ProgUit Lab1/ProgUit Lab1.cpp b/ProgUit Lab1/ProgUit Lab1.cpp index 49c7ef8..fdf94be 100644 --- a/ProgUit Lab1/ProgUit Lab1.cpp +++ b/ProgUit Lab1/ProgUit Lab1.cpp @@ -1,6 +1,11 @@ #include #include +#include "histogram.h" +#include "text.h" + + + using namespace std; @@ -39,122 +44,17 @@ input_data() { return in; } -void -find_minmax(const vector& numbers, double& min_in_numbers, double& max_in_numbers) { - min_in_numbers = numbers[0]; - max_in_numbers = *(max_element(begin(numbers), end(numbers))); - min_in_numbers = *(min_element(begin(numbers), end(numbers))); - -} - -vector make_histogram(const vector& numbers, const size_t bin_count) { - - vector bins(bin_count); - - double min_in_numbers, max_in_numbers; - find_minmax(numbers, min_in_numbers, max_in_numbers); - double bin_size = (max_in_numbers - min_in_numbers) / bin_count; - - for (size_t i = 0; i < numbers.size(); i++) { - int to_bin = int((numbers[i]) - min_in_numbers) / bin_size; - if (to_bin >= bin_count) { - bins[to_bin - 1]++; - } - else { - bins[to_bin]++; - } - } - - 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; - - int max_in_bins = 0; - - - for (int i = 0; i < bin_count; i++) { - if (bins[i] > max_in_bins) { - max_in_bins = bins[i]; - } - } - - - if (max_in_bins > MAX_ASTERISK) { - - for (int i = 0; i < bin_count; i++) { - if (bins[i] < 100) { - cout << " "; - } - if (bins[i] < 10) { - cout << " "; - } - size_t height = MAX_ASTERISK * (static_cast(bins[i]) / max_in_bins); - cout << bins[i] << "|"; - for (int j = 0; j < height; j++) { - cout << "*"; - } - cout << endl; - } - } - else { - // Если максимальное число среди коорзин меньше или равно 76 - 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 < bins[i]; j++) { - cout << "*"; - } - cout << endl; - } - - - } - - - - - -} int main() { - - // Константы - - - - - // Ввод данных через функцию - - //Input in = input_data(); - - // Объявление перменных промежуточных/вывода - - - - - auto in = input_data(); - auto bins = make_histogram(in.numbers, in.bin_count); - show_histogram_text(bins, in.bin_count); + // Функция main + auto in = input_data(); // Ввод структуры + auto bins = make_histogram(in.numbers, in.bin_count); // Распределние по корзинам + show_histogram_text(bins, in.bin_count); // Вывод графика diff --git a/ProgUit Lab1/histogram.cpp b/ProgUit Lab1/histogram.cpp new file mode 100644 index 0000000..ddd0192 --- /dev/null +++ b/ProgUit Lab1/histogram.cpp @@ -0,0 +1,36 @@ +#include +#include + +#include "histogram.h" + +using namespace std; + + + +void find_minmax(const vector& numbers, double& min_in_numbers, double& max_in_numbers) { + min_in_numbers = numbers[0]; + max_in_numbers = *(max_element(begin(numbers), end(numbers))); + min_in_numbers = *(min_element(begin(numbers), end(numbers))); + +} + +vector make_histogram(const vector& numbers, const size_t bin_count) { + + vector bins(bin_count); + + double min_in_numbers, max_in_numbers; + find_minmax(numbers, min_in_numbers, max_in_numbers); + double bin_size = (max_in_numbers - min_in_numbers) / bin_count; + + for (size_t i = 0; i < numbers.size(); i++) { + int to_bin = int((numbers[i]) - min_in_numbers) / bin_size; + if (to_bin >= bin_count) { + bins[to_bin - 1]++; + } + else { + bins[to_bin]++; + } + } + + return bins; +} \ No newline at end of file diff --git a/ProgUit Lab1/histogram.h b/ProgUit Lab1/histogram.h new file mode 100644 index 0000000..fe05928 --- /dev/null +++ b/ProgUit Lab1/histogram.h @@ -0,0 +1,12 @@ +#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/ProgUit Lab1/text.cpp b/ProgUit Lab1/text.cpp new file mode 100644 index 0000000..5c1d1d3 --- /dev/null +++ b/ProgUit Lab1/text.cpp @@ -0,0 +1,73 @@ +#include +#include + +#include "text.h" + +using namespace std; + + +void show_histogram_text(const vector bins, const size_t bin_count) { + // + + + const size_t SCREEN_WIDTH = 80; + const size_t MAX_ASTERISK = SCREEN_WIDTH - 3 - 1; + + int max_in_bins = 0; + + + for (int i = 0; i < bin_count; i++) { + if (bins[i] > max_in_bins) { + max_in_bins = bins[i]; + } + } + + + if (max_in_bins > MAX_ASTERISK) { + + for (int i = 0; i < bin_count; i++) { + if (bins[i] < 100) { + cout << " "; + } + if (bins[i] < 10) { + cout << " "; + } + size_t height = MAX_ASTERISK * (static_cast(bins[i]) / max_in_bins); + + cout << bins[i] << "|"; + + + for (int j = 0; j < height; j++) { + cout << "*"; + } + cout << endl; + } + + + } + else { + // 76 + 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 < bins[i]; j++) { + cout << "*"; + } + cout << endl; + } + + + } + + + + + +} \ No newline at end of file diff --git a/ProgUit Lab1/text.h b/ProgUit Lab1/text.h new file mode 100644 index 0000000..117c632 --- /dev/null +++ b/ProgUit Lab1/text.h @@ -0,0 +1,10 @@ +#ifndef TEXT_H_INCLUDED +#define TEXT_H_INCLUDED + + + +#include + +void show_histogram_text(std::vector bins, size_t bin_count); + +#endif // TEXT_H_INCLUDED