diff --git a/laba1cb/lab1final/main.cpp b/laba1cb/lab1final/main.cpp index 4713024..49ee3fb 100644 --- a/laba1cb/lab1final/main.cpp +++ b/laba1cb/lab1final/main.cpp @@ -1,3 +1,4 @@ +#include #include #include #include @@ -13,34 +14,56 @@ struct Input { }; Input -input_data() +input_data(istream& in,bool promt) { +if(promt){ -size_t number_count; -cerr << "count="; -cin >> number_count; + size_t number_count; + cerr << "count="; + cin >> number_count; -Input in; + Input rez; -in.numbers.resize(number_count); + rez.numbers.resize(number_count); -for (size_t i = 0; i < number_count; i++) { - cin >> in.numbers[i]; + for (size_t i = 0; i < number_count; i++) { + cin >> rez.numbers[i]; } cerr << "bin_count= "; -cin >> in.bin_count; +cin >> rez.bin_count; -return in; +return rez; } +else +{ + size_t number_count; + cerr << "count="; + cin >> number_count; + Input rez; -int main() -{ + rez.numbers.resize(number_count); + + for (size_t i = 0; i < number_count; i++) { + cin >> rez.numbers[i]; + } + + cerr << "bin_count= "; + cin >> rez.bin_count; - auto in = input_data(); + return rez; + } +} + + +int main() +{ curl_global_init(CURL_GLOBAL_ALL); + bool promt = true; + auto in = input_data(cin,promt); auto bins = make_histogram(in.numbers, in.bin_count); - show_histogram_svg(bins); + double ttt=0.0; + show_histogram_svg(bins,ttt); /* show_histogram_text(bins, in.bin_count);*/ return 0;