code: добавлен поток

lab01.cbp

@@ -32,7 +32,14 @@
 			<Add option="-Wall" />
 			<Add option="-fexceptions" />
 		</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>
 			<lib_finder disable_auto="1" />
 		</Extensions>

main.cpp

@@ -10,20 +10,20 @@ struct Input {
     size_t bin_count{};
 };
 Input
-input_data(){
-    size_t number_count, bin_count;
+input_data(istream& in){
+    size_t number_count;
 	cerr << "Enter number count: ";
     cin >> number_count;
-    Input in;
-    in.numbers.resize(number_count);
+    Input inp;
+    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;
-    return in;
+    cin >> inp.bin_count;
+    return inp;
 }
 
 
@@ -31,7 +31,7 @@ input_data(){
 
 int main()
 {
-    auto in = input_data();
+    auto in = input_data(cin);
     auto bins = make_histogram(in.numbers, in.bin_count);
     show_histogram_svg(bins);
 

unittest.cbp

@@ -31,6 +31,12 @@
 		<Compiler>
 			<Add option="-Wall" />
 		</Compiler>
+		<Unit filename="doctest.h" />
+		<Unit filename="histogram.cpp" />
+		<Unit filename="histogram_internal.h" />
+		<Unit filename="svg.cpp" />
+		<Unit filename="svg.h" />
+		<Unit filename="unittest.cpp" />
 		<Extensions />
 	</Project>
 </CodeBlocks_project_file>