From 7b2e36c39802215b3d0a25004821eac1b881f0d6 Mon Sep 17 00:00:00 2001
From: "lab01(PokhilAA)" <PokhilAA@mpei.ru>
Date: Sat, 18 May 2024 20:27:18 +0300
Subject: [PATCH] =?UTF-8?q?code:=20=D0=B2=D0=B2=D0=BE=D0=B4=20=D0=B8=D0=B7?=
 =?UTF-8?q?=20=D0=BF=D1=80=D0=BE=D0=B8=D0=B7=D0=B2=D0=BE=D0=BB=D1=8C=D0=BD?=
 =?UTF-8?q?=D0=BE=D0=B3=D0=BE=20=D0=BF=D0=BE=D1=82=D0=BE=D0=BA=D0=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 main.cpp | 35 ++++++++++++++++++++---------------
 1 file changed, 20 insertions(+), 15 deletions(-)

diff --git a/main.cpp b/main.cpp
index 51955eb..129c45c 100644
--- a/main.cpp
+++ b/main.cpp
@@ -1,8 +1,8 @@
 #include <iostream>
 #include <vector>
 #include "histogram.h"
-#include "text.h"
 #include "svg.h"
+
 using namespace std;
 
 struct Input {
@@ -11,29 +11,34 @@ struct Input {
 };
 
 Input
-input_data() {
+input_data(istream& _cin){
+    bool prompt = true;
     size_t number_count;
-    cout << "Enter number count: ";
-    cin >> number_count;
+    if (prompt){
+        cerr << "Enter number count:" << endl;
+    }
+    _cin >> number_count;
     Input in;
     in.numbers.resize(number_count);
     vector<double> numbers(number_count);
-    for (size_t i = 0; i < number_count; i++)
-    {
-        cin >> in.numbers[i];
+    if (prompt){
+        cerr << "Enter numbers:" << endl;
+    }
+    for (size_t i = 0; i < number_count; i++) {
+        _cin >> in.numbers[i];
+    }
+    if (prompt){
+        cerr << "Enter bin count:" << endl;
     }
-    size_t bin_count;
-    cout << "Enter count bin : ";
-    cin >> in.bin_count;
+    _cin >> in.bin_count;
     return in;
 }
 
 
-int main(){
-    const size_t SCREEN_WIDTH = 80;
-    const size_t MAX_ASTERISK = SCREEN_WIDTH - 3 - 1;
-    auto in = input_data();
-    const std::vector<double> bins = make_histogram(in.numbers, in.bin_count);
+int
+main() {
+    auto in = input_data(cin);
+    auto bins = make_histogram(in.numbers, in.bin_count);
     show_histogram_svg(bins);
     return 0;
 }