Merge branch 'master' of http://uit.mpei.ru/git/GalkinMK/cs-lab34

main.cpp

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