diff --git a/.gitignore b/.gitignore index 544fbcc..2b048d8 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ 03-scaling.input.txt LAB1.layout main.exe +/curl diff --git a/main.cpp b/main.cpp index 9a7a0bf..cf6b9e5 100644 --- a/main.cpp +++ b/main.cpp @@ -1,3 +1,4 @@ +#include #include #include #include "histogram.h" @@ -13,25 +14,26 @@ Input input_data(istream& in, bool prompt){ size_t number_count; if (prompt == true) cerr << "Enter number_count: "; - cin >> number_count; + in >> number_count; - Input in; - in.numbers.resize(number_count); + Input in1; + in1.numbers.resize(number_count); if (prompt == true) cerr << "Enter numbers: "; for (size_t i = 0; i < number_count; i++){ - cin >> in.numbers[i]; + in >> in1.numbers[i]; } if (prompt == true) cerr << "Enter bin count: "; - cin >> in.bin_count; + in >> in1.bin_count; - return in; + return in1; } int main() { - auto in = input_data(cin); + curl_global_init(CURL_GLOBAL_ALL); + auto in = input_data(cin, false); auto bins = make_histogram(in.numbers, in.bin_count); show_histogram_svg(bins); return 0;