From 841f6d02cb4d06f17de348e35eb76029cbc848f5 Mon Sep 17 00:00:00 2001
From: "Alexander (AntonovichAN)" <AntonovichAN@mpei.ru>
Date: Sun, 6 Oct 2024 16:30:03 +0300
Subject: [PATCH] =?UTF-8?q?code:=20=D0=9B=D0=A04=20=D0=BF=D0=BE=D1=82?=
 =?UTF-8?q?=D0=BE=D0=BA=20=D0=B2=D0=B2=D0=BE=D0=B4=D0=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 lab01.cbp    |  3 +++
 main.cpp     | 18 +++++++++---------
 unittest.cbp |  4 ++++
 3 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/lab01.cbp b/lab01.cbp
index 89f0c56..51bcc6e 100644
--- a/lab01.cbp
+++ b/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 />
diff --git a/main.cpp b/main.cpp
index 7b69fed..f14eca6 100644
--- a/main.cpp
+++ b/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);
diff --git a/unittest.cbp b/unittest.cbp
index 7f9621b..5a9c8c0 100644
--- a/unittest.cbp
+++ b/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>