diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..1a85222 --- /dev/null +++ b/.gitignore @@ -0,0 +1,6 @@ +bin/ +obj/ +*.cbp +*.layout +*.depend +*.user diff --git a/histogram.cpp b/histogram.cpp index 641db08..bd8cadf 100644 --- a/histogram.cpp +++ b/histogram.cpp @@ -2,15 +2,9 @@ #include using namespace std; -void find_minmax(const vector& numbers, double& min, double& max) { - if (numbers.empty()) - { - min = 0; - max = 0; - return; - } +static void find_minmax(const vector& numbers, double& min, double& max) { max = numbers[0]; - min = numbers[0]; + min = numbers[1]; for (double x : numbers) { if (x < min) min = x; else if (x > max) max = x; diff --git a/histogram.h b/histogram.h index e69de29..1ee7f4d 100644 --- a/histogram.h +++ b/histogram.h @@ -0,0 +1,9 @@ +#ifndef HISTOGRAM_H_INCLUDED +#define HISTOGRAM_H_INCLUDED + +#include +using namespace std; + +vector make_histogram(vector numbers, size_t bin_count); + +#endif diff --git a/lab01.cbp b/lab01.cbp index 6e613ff..cdb95d8 100644 --- a/lab01.cbp +++ b/lab01.cbp @@ -36,7 +36,10 @@ + + + diff --git a/main.cpp b/main.cpp index a5044e3..1457c4c 100644 --- a/main.cpp +++ b/main.cpp @@ -1,140 +1,34 @@ -#include #include - +#include +#include "histogram.h" +#include "text.h" using namespace std; -struct Input -{ + +struct Input { vector numbers; - size_t bin_count{}; + size_t bin_count; }; -Input input_data() -{ + +Input input_data() { Input in; size_t number_count; cerr << "Enter number count: "; cin >> number_count; + in.numbers.resize(number_count); cerr << "Enter numbers: "; for (size_t i = 0; i < number_count; i++) { cin >> in.numbers[i]; } - size_t bin_count; + cerr << "Enter bin count: "; cin >> in.bin_count; 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; - } - } -} -int main() -{ - const size_t SCREEN_WIDTH = 80; - const size_t MAX_ASTERISK = SCREEN_WIDTH - 3 - 1; - Input in = input_data(); - // - size_t number_count; - cerr << "Enter number count: "; - cin >> number_count; - - vector numbers(number_count); - cerr << "Enter numbers: "; - for (size_t i = 0; i < number_count; i++) - { - cin >> numbers[i]; - } - - size_t bin_count; - cerr << "Enter bin count: "; - cin >> bin_count; - // - vector bins(bin_count, 0); -double min, max; -find_minmax(in.numbers, min, max); - // double min = numbers[0]; - // double max = numbers[0]; - //for (double x : numbers) - // { - // if (x < min) - // { - // min = x; - // } - // else if (x > max) - // { - // max = x; - // } - // } - - double bin_size = (max - min) / bin_count; - - for (size_t i = 0; i < number_count; 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]++; - } - } - size_t max_bin_count = 0; - for (size_t bin : bins) - { - if (bin > max_bin_count) - { - max_bin_count = bin; - } - } - - if (max_bin_count <= MAX_ASTERISK) - { - for (size_t i = 0; i < bin_count; i++) - { - if (bins[i] < 10) cout << " "; - cout << " " << bins[i] << "|"; - for (size_t j = 0; j < bins[i]; j++) - { - cout << "*"; - } - cout << endl; - } - } - else - { - for (size_t i = 0; i < bin_count; i++) - { - size_t height = static_cast(MAX_ASTERISK * (static_cast(bins[i]) / max_bin_count)); - // Выравнивание подписи - if (bins[i] < 100) cout << " "; - if (bins[i] < 10) cout << " "; - cout << bins[i] << "|"; - - for (size_t j = 0; j < height; j++) - { - cout << "*"; - } - cout << endl; - } - } +int main() { + auto in = input_data(); + auto bins = make_histogram(in.numbers, in.bin_count); + show_histogram_text(bins, in.bin_count); return 0; } diff --git a/text.cpp b/text.cpp index e69de29..2a52efe 100644 --- a/text.cpp +++ b/text.cpp @@ -0,0 +1,40 @@ +#include "text.h" +#include +#include + +using namespace std; + +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; + double max_bin; + size_t height; + max_bin = bins[0]; + height = bins[0]; + for (size_t i = 0; i < bin_count; i++) { + if (bins[i] > max_bin) { + max_bin = bins[i]; + } + } + + bool flag = false; + if (max_bin > 80) { + flag = true; + } + for (size_t i = 0; i < bin_count; i++) { + if (bins[i] < 100) cout << " "; + if (bins[i] < 10) cout << " "; + cout << bins[i] << "|"; + if (flag == true) { + height = MAX_ASTERISK * (static_cast(bins[i]) / max_bin); + } + else { + height = bins[i]; + } + for (size_t j = 0; j < height; j++) { + cout << "*"; + } + cout << endl; + } + +} diff --git a/text.h b/text.h index e69de29..f5c2730 100644 --- a/text.h +++ b/text.h @@ -0,0 +1,9 @@ +#ifndef TEXT_H_INCLUDED +#define TEXT_H_INCLUDED + +#include +using namespace std; + +void show_histogram_text(vector bins, size_t bin_count); + +#endif