From 00b9e9ee2d71ae443d93f28ad19379b46e1a8cde Mon Sep 17 00:00:00 2001 From: KireevYP Date: Sun, 21 Apr 2024 17:08:28 +0300 Subject: [PATCH] =?UTF-8?q?code:=20=D1=80=D0=B0=D0=B7=D0=B1=D0=B8=D0=B5?= =?UTF-8?q?=D0=BD=D0=B8=D0=B5=20=D0=BD=D0=B0=20=D1=84=D0=B0=D0=B9=D0=BB?= =?UTF-8?q?=D1=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- histogram.cpp | 43 ++++++++++++++++++++++++++++++++++++ histogram.h | 6 +++++ main.cpp | 61 ++------------------------------------------------- text.cpp | 25 +++++++++++++++++++++ text.h | 5 +++++ 5 files changed, 81 insertions(+), 59 deletions(-) create mode 100644 histogram.cpp create mode 100644 histogram.h create mode 100644 text.cpp create mode 100644 text.h diff --git a/histogram.cpp b/histogram.cpp new file mode 100644 index 0000000..2fcff5d --- /dev/null +++ b/histogram.cpp @@ -0,0 +1,43 @@ +#include "histogram.h" +#include +#include +using namespace std; + +static 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; + } + } +} + +std::vector +make_histogram(const std::vector& numbers, size_t bin_count){ + vector bins (bin_count); + + double min = 0, max = 0; + find_minmax(numbers, min, max); + + double bin_size = (max - min) / bin_count; + for (int i = 0; i < numbers.size(); i++) { + bool found = false; + for (int 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..234b64d --- /dev/null +++ b/histogram.h @@ -0,0 +1,6 @@ +#pragma once +#include + +std::vector +make_histogram(const std::vector& numbers, size_t bin_count); + diff --git a/main.cpp b/main.cpp index f0ecd3a..b5cebd7 100644 --- a/main.cpp +++ b/main.cpp @@ -1,6 +1,8 @@ #include #include #include +#include "histogram.h" +#include "text.h" using namespace std; struct Input { vector numbers; @@ -26,65 +28,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 bin_count){ - vector bins (bin_count); - - double min = 0, max = 0; - find_minmax(numbers, min, max); - - double bin_size = (max - min) / bin_count; - for (int i = 0; i < numbers.size(); i++) { - bool found = false; - for (int 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 (const vector& bins,size_t MAX_ASTERISK, size_t bin_count){ - double max_count = bins[0]; - for (double x: bins){ - if (x > max_count) { - max_count = x; - } - } - - for (int i = 0; i < bin_count; i++){ - double count = bins[i]; - size_t height = MAX_ASTERISK * (static_cast(count) / max_count); - string line (height , '*'); - if (bins[i]<100) - {cout << ' ';} - if (bins[i]<10) - {cout << ' ';} - cout << bins[i] << "|" << line << endl; - } -} int main() { const size_t SCREEN_WIDTH = 80; diff --git a/text.cpp b/text.cpp new file mode 100644 index 0000000..5272b36 --- /dev/null +++ b/text.cpp @@ -0,0 +1,25 @@ +#include "text.h" +#include +#include +using namespace std; + +void +show_histogram_text (const vector& bins,size_t MAX_ASTERISK, size_t bin_count){ + double max_count = bins[0]; + for (double x: bins){ + if (x > max_count) { + max_count = x; + } + } + + for (int i = 0; i < bin_count; i++){ + double count = bins[i]; + size_t height = MAX_ASTERISK * (static_cast(count) / max_count); + string line (height , '*'); + if (bins[i]<100) + {cout << ' ';} + if (bins[i]<10) + {cout << ' ';} + cout << bins[i] << "|" << line << endl; + } +} diff --git a/text.h b/text.h new file mode 100644 index 0000000..9389d66 --- /dev/null +++ b/text.h @@ -0,0 +1,5 @@ +#pragma once +#include + +void +show_histogram_text (const std::vector& bins,size_t MAX_ASTERISK, size_t bin_count);