code: добавлен ввод из произвольного потока

main.cpp

@@ -20,19 +20,19 @@ struct Input {
 
 
 Input
-input_data() {
+input_data(istream& in) {
     size_t number_count;
-    cin >> number_count;
+    in >> number_count;
-    Input in;
+    Input inn;
-    in.numbers.resize(number_count);
+    inn.numbers.resize(number_count);
     vector<double> numbers(number_count);
     for (size_t i = 0; i < number_count; i++) {
-        cin >> in.numbers[i];
+        in >> inn.numbers[i];
     }
 
 size_t bin_count;
-cin >> in.bin_count;
+in >> inn.bin_count;
-return in;
+return inn;
 }
 
 
@@ -40,9 +40,10 @@ return in;
 
 int main()
 {
-    auto in = input_data();
+    bool flag;
-    auto bins = make_histogram(in.numbers, in.bin_count);
+    auto inn = input_data(cin);
-    auto procent = make_histogram_proc(in.numbers, in.bin_count, bins);
+    auto bins = make_histogram(inn.numbers, inn.bin_count, flag);
+    auto procent = make_histogram_proc(inn.numbers, inn.bin_count, bins);
     show_histogram_svg(bins, procent);
 
     return 0;