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