diff --git a/main.cpp b/main.cpp index cd9b02f..e48cec4 100644 --- a/main.cpp +++ b/main.cpp @@ -1,54 +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++) { + + vector numbers(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; } - - -} - - - 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); }