From 03b79f9172bc728438ba9bbc93c29be6b1e6bd1b Mon Sep 17 00:00:00 2001
From: "Yaroslav (PivovarovYV)" <PivovarovYV@mpei.ru>
Date: Tue, 6 Jun 2023 17:58:13 +0300
Subject: [PATCH] =?UTF-8?q?code:=20=D0=B4=D0=BE=D0=B1=D0=B0=D0=B2=D0=B8?=
 =?UTF-8?q?=D0=BB=20=D0=BB=D0=BE=D0=B3=D0=B8=D1=87=D0=B5=D1=81=D0=BA=D1=83?=
 =?UTF-8?q?=D1=8E=20=D0=BF=D0=B5=D1=80=D0=B5=D0=BC=D0=B5=D0=BD=D0=BD=D1=83?=
 =?UTF-8?q?=D1=8E=20promt=20=D0=B4=D0=BB=D1=8F=20=D0=B2=D1=8B=D0=B2=D0=BE?=
 =?UTF-8?q?=D0=B4=D0=B0=20=D0=BF=D1=80=D0=B8=D0=B3=D0=BB=D0=B0=D1=88=D0=B5?=
 =?UTF-8?q?=D0=BD=D0=B8=D0=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 main.cpp        | 36 +++++++++++++++++-------------------
 project3.depend |  7 ++++++-
 2 files changed, 23 insertions(+), 20 deletions(-)

diff --git a/main.cpp b/main.cpp
index 6c5d263..d2f2273 100644
--- a/main.cpp
+++ b/main.cpp
@@ -1,45 +1,43 @@
+#include <math.h>
 #include <iostream>
+#include <conio.h>
 #include <vector>
-#include <cmath>
 #include "histogram.h"
 #include "text.h"
 #include "svg.h"
-#include <string>
-#include <conio.h>
+#include "histogram_internal.h"
 using namespace std;
 
-
-
 struct Input {
     vector<double> numbers;
     size_t bin_count{};
+    size_t interval;
 };
 
 Input
-input_data() {
+input_data(istream &tin, bool prompt){
+    if (prompt)
+        cerr << "Input numbers count: ";
     size_t number_count;
-    cin >> number_count;
+    tin >> number_count;
     Input in;
     in.numbers.resize(number_count);
-
+    if (prompt)
+        cerr << "Input numbers: ";
     for (size_t i = 0; i < number_count; i++) {
-        cin >> in.numbers[i];
+        tin >> in.numbers[i];
     }
-
-    cerr << "Enter number of bins";
-    cin >> in.bin_count;
+    if (prompt)
+        cerr << "Input bin count: ";
+    tin >> in.bin_count;
     return in;
 }
 
 
-
-
-
-int main()
-{
-    Input in = input_data();
+int main() {
+    Input in = input_data(cin, false);
     auto bins = make_histogram(in.numbers, in.bin_count);
     show_histogram_svg(bins);
     return 0;
-    }
+}
 
diff --git a/project3.depend b/project3.depend
index 2e15fff..5cb1a1b 100644
--- a/project3.depend
+++ b/project3.depend
@@ -33,7 +33,12 @@
 1685969642 c:\users\hp\desktop\lab-03\project3\histogram_internal.h
 	<vector>
 
-1685943355 source:c:\users\hp\desktop\lab-03\project3\svg.cpp
+1686062922 source:c:\users\hp\desktop\lab-03\project3\svg.cpp
+	<iostream>
+	<conio.h>
+	<vector>
+	<string>
+	"svg.h"
 	<math.h>
 	<iostream>
 	<conio.h>