добавлен ввод из произвольного потока

lab4
KhodiukMR 12 месяцев назад
Родитель 7c6d2f19da
Сommit 0de706ff4e

@ -13,16 +13,16 @@ struct Input {
}; };
Input Input
InputData() { InputData(istream& stream) {
Input in; Input in;
size_t NumberCount; size_t NumberCount;
cerr << "Enter number count: "; cerr << "Enter number count: ";
cin >> NumberCount; stream >> NumberCount;
cerr << "Enter bin count: "; cerr << "Enter bin count: ";
cin >> in.BinCount; stream >> in.BinCount;
in.Numbers.resize(NumberCount); in.Numbers.resize(NumberCount);
for (int i = 0; i < NumberCount; i++) { for (int i = 0; i < NumberCount; i++) {
cin >> in.Numbers[i]; stream >> in.Numbers[i];
} }
return in; return in;
} }
@ -35,7 +35,7 @@ void ShowHistogrammText(vector<size_t> Bins);
int main() { int main() {
double MaxCount = 0; double MaxCount = 0;
Input in = InputData(); Input in = InputData(cin);
vector <size_t> Bins(in.BinCount); vector <size_t> Bins(in.BinCount);
Bins = MakeHistogram(in.Numbers, in.BinCount, MaxCount); Bins = MakeHistogram(in.Numbers, in.BinCount, MaxCount);
ShowHistogramSvg(Bins); ShowHistogramSvg(Bins);

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