diff --git a/main.cpp b/main.cpp index 27533d4..4b49627 100644 --- a/main.cpp +++ b/main.cpp @@ -12,30 +12,31 @@ struct Input{ }; Input -input_data() +input_data(istream& in) { size_t count; // все числа cerr << "Count= "; cin >> count; - Input in; - in.numbers.resize(count); + Input rez; + rez.numbers.resize(count); cerr << "numbers:"; for (size_t i = 0; i < count; i++) { - cin >> in.numbers[i]; + cin >> rez.numbers[i]; } cerr << "Bin_count= "; - cin >> in.bin_count; + cin >> rez.bin_count; - return in; + return rez; } int main() { - Input in = input_data(); + Input in = input_data(cin); auto bins=make_histogram(in.numbers,in.bin_count); - show_histogram_svg(bins); //,in.bin_count); + double ttt = 0.0; + show_histogram_svg(bins,ttt); return 0; }