модификация кода функции input_data

master
Alex 11 месяцев назад
Родитель c8f4ebca96
Сommit ba7a81ca40

@ -13,34 +13,34 @@ struct Input
vector<string> colors; vector<string> colors;
}; };
Input input_data() Input input_data(istream& inp)
{ {
Input in; Input in;
size_t number_count; size_t number_count;
cerr << "Enter number_count: "; cerr << "Enter number_count: ";
cin >> number_count; inp >> number_count;
in.numbers.resize(number_count); in.numbers.resize(number_count);
for (size_t i = 0; i < number_count; i++) for (size_t i = 0; i < number_count; i++)
{ {
cin >> in.numbers[i]; inp >> in.numbers[i];
} }
cerr << "Enter bin_count: "; cerr << "Enter bin_count: ";
cin >> in.bin_count; inp >> in.bin_count;
in.colors.resize(in.bin_count); in.colors.resize(in.bin_count);
cerr << "Enter colors: "; cerr << "Enter colors: ";
for (size_t i = 0; i < in.bin_count; i++) { for (size_t i = 0; i < in.bin_count; i++) {
cin >> in.colors[i]; inp >> in.colors[i];
} }
return in; return in;
} }
int main() int main()
{ {
auto in = input_data(); auto in = input_data(cin);
auto bins = make_histogram(in.numbers, in.bin_count); auto bins = make_histogram(in.numbers, in.bin_count);
show_histogram_svg(bins, in.colors); show_histogram_svg(bins, in.colors);
return 0; return 0;

Загрузка…
Отмена
Сохранить