1. punkt lab04

.gitignore

@@ -7,4 +7,3 @@
 /unittest.depend
 /unittest.layout
 /unittest1.depend
-

main.cpp

@@ -13,26 +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);
 }

unittest1.layout

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
+<CodeBlocks_layout_file>
+	<FileVersion major="1" minor="0" />
+	<ActiveTarget name="Debug" />
+</CodeBlocks_layout_file>