diff --git a/main.cpp b/main.cpp index 0b5bd0e..bfdebda 100644 --- a/main.cpp +++ b/main.cpp @@ -15,30 +15,34 @@ struct Input }; Input -input_data() +input_data(istream& in, bool promt) { - Input in; + Input ik; - cerr<<"Marks: "; - cin>>in.number_count; + size_t number_count; + if (promt) + { + cerr<<"Marks: "; + } + in>>ik.number_count; - in.numbers.resize(in.number_count); - for (size_t i=0; i>in.kol_kor; - return in; + in>>ik.kol_kor; + return ik; } int main() { size_t number_count; - auto in = input_data(); + auto in = input_data(cin,true); auto B = make_histogram(in.numbers, in.kol_kor); show_histogram_svg(B, in.number_count);