From fa47ef46492408995431a2c393f40080b2a74e46 Mon Sep 17 00:00:00 2001
From: ShinkarenkoVA <shinkarenkova@mpei.ru>
Date: Sun, 19 May 2024 00:47:39 +0300
Subject: [PATCH] =?UTF-8?q?code:=20=D0=BF=D0=B5=D1=80=D0=B5=D0=BF=D0=B8?=
 =?UTF-8?q?=D1=81=D0=B0=D0=BB=D0=B8=20=D0=B2=D0=B2=D0=BE=D0=B4=20=D0=B8=20?=
 =?UTF-8?q?=D0=B2=D1=8B=D0=B7=D0=BE=D0=B2=20=D1=84=D1=83=D0=BD=D0=BA=D1=86?=
 =?UTF-8?q?=D0=B8=D0=B8=20=D0=B2=D0=B2=D0=BE=D0=B4=D0=B0=20=D0=B4=D0=B0?=
 =?UTF-8?q?=D0=BD=D0=BD=D1=8B=D1=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 main.cpp | 26 ++++++++++----------------
 1 file changed, 10 insertions(+), 16 deletions(-)

diff --git a/main.cpp b/main.cpp
index 3e0fee2..4cd9606 100644
--- a/main.cpp
+++ b/main.cpp
@@ -11,41 +11,35 @@ using namespace std;
 struct Input {
     vector<double> numbers;
     size_t bin_count{};
-    string colors_stroke;
-    string colors_fill;
 };
 
 Input
-input_data(){
+input_data(istream& in){
 
     size_t number_count;
     cerr << "Enter number count: ";
-    cin >> number_count;
+    in >> number_count;
 
-    Input in;
+    Input iinn;
 
-    in.numbers.resize(number_count);
+    iinn.numbers.resize(number_count);
     cerr << "Enter numbers: " << endl;
     for (size_t i=0; i < number_count; i++)
     {
-        cin >> in.numbers[i];
+        in >> iinn.numbers[i];
     }
 
     cerr << "Enter bin count: ";
-    cin >> in.bin_count;
-    in.colors_stroke = "midnightblue";
-    in.colors_fill = "deeppink";
+    in >> iinn.bin_count;
 
-    input_colors(in.colors_stroke, in.colors_fill);
-
-    return in;
+    return iinn;
 }
 
 int main()
 {
 
-    auto in = input_data();
-    std::vector<size_t> bins = make_histogram(in.numbers, in.bin_count);
-    show_histogram_svg(bins, in.colors_stroke, in.colors_fill);
+    Input iinn = input_data(cin);
+    std::vector<size_t> bins = make_histogram(iinn.numbers, iinn.bin_count);
+    show_histogram_svg(bins);
     return 0;
 }