diff --git a/main.cpp b/main.cpp index db31c70..e48cec4 100644 --- a/main.cpp +++ b/main.cpp @@ -1,115 +1,40 @@ #include #include +#include "histogram.h" +#include "text.h" +#include "svg.h" + using namespace std; -struct Input { +struct Input +{ vector numbers; size_t bin_count{}; }; Input -input_data() { +input_data() +{ Input in; - - cerr << "Enter number count: "; size_t number_count; cin >> number_count; - in.numbers.resize(number_count); - for (size_t i = 0; i < number_count; i++) { - cin >> in.numbers[i]; - } - cerr << "Enter number bin: "; - cin >> in.bin_count; - - return in; -} + vector numbers(number_count); -void find_minmax(const vector& numbers, double& min, double& max) { - min = numbers[0]; - max = numbers[0]; - for (double x : numbers) + for (size_t i = 0; i < number_count; i++) { - if (x < min) - { - min = x; - } - else if (x > max) - { - max = x; - } - } -} -vector -make_histogram(const vector& numbers, size_t bin_count) { - double min, max; - find_minmax(numbers, min, max); - - vector bins(bin_count); - 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(const vector& bins, size_t max_count, size_t MAX_ASTERISK, size_t bin_count){ - for (size_t i = 0; i < bin_count; i++){ - if (bins[i]<10) { - cout << " " << bins[i] << "|"; - } - else if (bins[i]<100) { - cout << " " << bins[i] << "|"; - } - else if (bins[i]<1000) { - cout << bins[i] << "|"; - } - - size_t height; - - if (max_count<=MAX_ASTERISK) { - height = bins[i]; - } - else { - height = MAX_ASTERISK * (static_cast(bins[i]) / max_count); - } - for (size_t j = 0; j < height; j++) { - cout << "*"; - } - cout << endl; + cin >> in.numbers[i]; } + cin >> in.bin_count; + return in; } int main() { - const size_t SCREEN_WIDTH = 80; - const size_t MAX_ASTERISK = SCREEN_WIDTH - 3 - 1; - + size_t max_count; auto in = input_data(); auto bins = make_histogram(in.numbers, in.bin_count); - - - size_t max_count = bins[0]; - for (size_t i = 0; i < bins.size(); i++) { - if (bins[i] > max_count) { - max_count = bins[i]; - } - } - show_histogram_text(bins, max_count, MAX_ASTERISK, in.bin_count); - - return 0; + show_histogram_svg(bins); }