code:new in flow

vector.cpp

@@ -13,27 +13,43 @@ struct Input {
 
 };
 
-Input input_data()
+//Input input_data()    3я лабораторная
+//{
+//	size_t number_count;
+//	cin >> number_count;
+//	Input in;
+//	in.numbers.resize(number_count);
+//	for (size_t i = 0; i < number_count; i++)
+//	{
+//		cin >> in.numbers[i];
+//
+//	}
+//
+//	cin >> in.bin_count;
+//
+//	return in;
+//}
+Input input_data(istream& in)
 {
 	size_t number_count;
 	cin >> number_count;
-	Input in;
-	in.numbers.resize(number_count);
+	Input data;
+	data.numbers.resize(number_count);
 	for (size_t i = 0; i < number_count; i++)
 	{
-		cin >> in.numbers[i];
+		cin >> data.numbers[i];
 
 	}
 
-	cin >> in.bin_count;
+	cin >> data.bin_count;
 
-	return in;
+	return data;
 }
 
 
 int main()
 {
-	Input in = input_data();
+	auto in = input_data(cin);
 	vector <size_t> bins = make_histogram(in.numbers, in.bin_count);
 	show_histogram_svg(bins, in.bin_count);
 }