code: ЛР4 поток ввода

lab01.cbp

@@ -34,7 +34,10 @@
 		</Compiler>
 		<Unit filename="histogram.cpp" />
 		<Unit filename="histogram.h" />
+		<Unit filename="histogram_internal.h" />
 		<Unit filename="main.cpp" />
+		<Unit filename="svg.cpp" />
+		<Unit filename="svg.h" />
 		<Unit filename="text.cpp" />
 		<Unit filename="text.h" />
 		<Extensions />

main.cpp

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

unittest.cbp

@@ -31,6 +31,10 @@
 		<Compiler>
 			<Add option="-Wall" />
 		</Compiler>
+		<Unit filename="doctest.h" />
+		<Unit filename="histogram.cpp" />
+		<Unit filename="histogram_internal.h" />
+		<Unit filename="unittest.cpp" />
 		<Extensions>
 			<lib_finder disable_auto="1" />
 		</Extensions>