From 30304c0921bd2f70c786b86d5a8e50c6e1f7283d Mon Sep 17 00:00:00 2001
From: "Varvara (ZeninaVA)" <ZeninaVA@mpei.ru>
Date: Fri, 16 May 2025 18:15:43 +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=BD=D0=B0=20=D1=84=D1=83=D0=BD=D0=BA=D1=86=D0=B8?=
 =?UTF-8?q?=D1=8F=20input=5Fdata?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 lab1.depend | 16 ++++++----------
 main.cpp    | 24 ++++++++++++++----------
 2 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/lab1.depend b/lab1.depend
index e1f3d91..c274f96 100644
--- a/lab1.depend
+++ b/lab1.depend
@@ -1,19 +1,15 @@
 # depslib dependency file v1.0
-1747403061 source:c:\users\professional\desktop\cs-lab34\lab1\histogram.cpp
+1747403716 source:c:\users\professional\desktop\cs-lab34\lab1\histogram.cpp
 	"histogram.h"
 
-1747403061 c:\users\professional\desktop\cs-lab34\lab1\histogram.h
+1747403716 c:\users\professional\desktop\cs-lab34\lab1\histogram.h
 	<vector>
 	<iostream>
 
-1746444035 source:c:\users\professional\desktop\cs-lab34\lab1\text.cpp
+1747403716 source:c:\users\professional\desktop\cs-lab34\lab1\text.cpp
 	"text.h"
-	"histogram.h"
-	<iostream>
-	<vector>
-	<string>
 
-1747403061 c:\users\professional\desktop\cs-lab34\lab1\text.h
+1747403716 c:\users\professional\desktop\cs-lab34\lab1\text.h
 	<iostream>
 	<vector>
 
@@ -22,12 +18,12 @@
 	"text.h"
 	"svg.h"
 
-1747403061 c:\users\professional\desktop\cs-lab34\lab1\svg.h
+1747403716 c:\users\professional\desktop\cs-lab34\lab1\svg.h
 	<iostream>
 	<vector>
 	<string>
 	<math.h>
 
-1747403061 source:c:\users\professional\desktop\cs-lab34\lab1\svg.cpp
+1747403716 source:c:\users\professional\desktop\cs-lab34\lab1\svg.cpp
 	"svg.h"
 
diff --git a/main.cpp b/main.cpp
index 558fb56..e394bd1 100644
--- a/main.cpp
+++ b/main.cpp
@@ -1,28 +1,32 @@
 #include "histogram.h"
 #include "text.h"
 #include "svg.h"
+#include <iostream>
+#include <vector>
 
 struct Input {
-    vector<double> vec;
+    std::vector<double> vec;
     size_t korz{};
 };
-Input input_data() {
-    Input in;
+
+Input input_data(std::istream &in) {
+    Input data;
     size_t n, korz;
 
     cerr << "Number of elements: ";
-    cin >> n;
-    in.vec.resize(n);
+    in >> n;
+    data.vec.resize(n);
     cerr << "Elements: ";
     for (size_t i = 0; i < n; i++)
-        cin >> in.vec[i];
+        in >> data.vec[i];
     cerr << "Enter bin count: ";
-    cin >> in.korz;
-    return in;
+    in >> korz;
+    data.korz = korz;
+    return data;
 }
-
 int main() {
-    auto in = input_data();
+    using namespace std;
+    auto in = input_data(cin);
     auto bins = make_histogram(in.korz, in.vec);
     show_histogram_svg(bins);
 }