1. punkt lab04

main.cpp

@@ -13,27 +13,27 @@ struct Input
 };
 
 Input
-input_data()
+input_data(istream& in)
 {
 
     size_t number_count;
-    cin >> number_count;
+    in >> number_count;
-    Input in;
+    Input rez;
 
-    in.numbers.resize(number_count);
+    rez.numbers.resize(number_count);
     for (size_t i = 0; i < number_count; i++)
     {
-        cin >> in.numbers[i];
+        in >> rez.numbers[i];
     }
-    cin >> in.bin_count;
+    in >> rez.bin_count;
-    return in;
+    return rez;
 }
 
 int
 main()
 {
-    auto in = input_data();
+    auto in = input_data(cin);
     auto bins = make_histogram(in.numbers, in.bin_count);
-    show_histogram_svg(bins);
+    //show_histogram_svg(bins);
-    //show_histogram_text(bins, in.numbers, in.bin_count);
+    show_histogram_text(bins, in.numbers, in.bin_count);
 }