diff --git a/main.cpp b/main.cpp index 4b49627..fa70771 100644 --- a/main.cpp +++ b/main.cpp @@ -4,6 +4,7 @@ #include "histogram.h" #include "text.h" #include "svg.h" +#include using namespace std; struct Input{ @@ -12,31 +13,47 @@ struct Input{ }; Input -input_data(istream& in) +input_data(istream& in,bool promt) { - size_t count; // все числа - cerr << "Count= "; - cin >> count; + if (promt){ + size_t count; // все числа + cerr << "Count= "; + cin >> count; - Input rez; - rez.numbers.resize(count); - cerr << "numbers:"; - for (size_t i = 0; i < count; i++) - { - cin >> rez.numbers[i]; - } + Input rez; + rez.numbers.resize(count); + cerr << "numbers:"; + for (size_t i = 0; i < count; i++) + { + cin >> rez.numbers[i]; + } - cerr << "Bin_count= "; - cin >> rez.bin_count; + cerr << "Bin_count= "; + cin >> rez.bin_count; + return rez; + } + else{ + size_t count; // все числа + cin >> count; - return rez; + Input rez; + rez.numbers.resize(count); + for (size_t i = 0; i < count; i++) + { + cin >> rez.numbers[i]; + } + cin >> rez.bin_count; + return rez; + } } int main() { - Input in = input_data(cin); + curl_global_init(CURL_GLOBAL_ALL); + bool promt=true; + Input in = input_data(cin, promt); auto bins=make_histogram(in.numbers,in.bin_count); - double ttt = 0.0; - show_histogram_svg(bins,ttt); + double sr = 0.0; + show_histogram_svg(bins,sr); return 0; }