diff --git a/main.cpp b/main.cpp index 8c810cf..a28a84d 100644 --- a/main.cpp +++ b/main.cpp @@ -3,6 +3,7 @@ #include #include "histogram.h" #include "text.h" +#include "svg.h" using namespace std; const size_t SCREEN_WIDTH = 80; const size_t MAX_ASTERISK = SCREEN_WIDTH - 3 - 1; @@ -13,17 +14,17 @@ struct Input { }; Input -input_data() { +input_data(istream& in) { size_t number_count; - cin >> number_count; - Input in; - in.numbers.resize(number_count); + in >> number_count; + Input inn; + inn.numbers.resize(number_count); for (size_t i = 0; i < number_count; i++) { - cin >> in.numbers[i]; + in >> inn.numbers[i]; } size_t bin_count; - cin >> in.bin_count; - return in; + in >> inn.bin_count; + return inn; } @@ -34,9 +35,9 @@ input_data() { int main() { - auto in = input_data(); + auto in = input_data(cin); auto bins = make_histogram(in.numbers, in.bin_count); - show_histogram_text(bins); + show_histogram_svg(bins); return 0; }