лаб04. Добавлена переменная-поток

main.cpp

@@ -12,26 +12,26 @@ struct Input {
     size_t bin_count{};
 };
 Input
-input_data(){
+input_data(istream& in){
-    size_t number_count, bin_count;
+    size_t number_count;
 	cerr << "Enter number count: ";
     cin >> number_count; //Êîë-âî ÷èñåë
-    Input in;
+    Input inp;
-    in.numbers.resize(number_count);
+    inp.numbers.resize(number_count);
 
     for (size_t i = 0; i < number_count; i++)
     {
         cerr << "Enter Num[" << i << "]: ";
-        cin >> in.numbers[i]; //Ââîä ÷èñåë
+        cin >> inp.numbers[i]; //Ââîä ÷èñåë
     }
     cerr << "Enter bin count: ";
-    cin >> in.bin_count; //Êîë-âî êîðçèí
+    cin >> inp.bin_count; //Êîë-âî êîðçèí
-    return in;
+    return inp;
 }
 
 int main()
 {
-    auto in = input_data();
+    auto in = input_data(cin);
     auto bins = make_histogram(in.numbers, in.bin_count);
     auto borders = make_borders(in.numbers, in.bin_count);
     show_histogram_svg(bins, borders, in.bin_count);