From d16031c3f4c2cace7e660834db043f1830ce0609 Mon Sep 17 00:00:00 2001
From: "PARZIVAL (BreganIM)" <BreganIM@mpei.ru>
Date: Thu, 8 May 2025 17:34:01 +0300
Subject: [PATCH] =?UTF-8?q?code:=D0=9A=D0=BE=D0=B4=20=D0=BE=D1=82=D0=BA?=
 =?UTF-8?q?=D0=B0=D1=87=D0=B5=D0=BD=20=D0=B4=D0=BE=20=D0=BC=D0=BE=D0=BC?=
 =?UTF-8?q?=D0=B5=D0=BD=D1=82=D0=B0=20=D0=B7=D0=B0=D1=89=D0=B8=D1=82=D1=8B?=
 =?UTF-8?q?=20=D0=B8=20=D0=BF=D0=B5=D1=80=D0=B5=D0=BF=D0=B8=D1=81=D0=B0?=
 =?UTF-8?q?=D0=BD=D0=B0=20=D1=84=D1=83=D0=BD=D0=BA=D1=86=D0=B8=D1=8F=20inp?=
 =?UTF-8?q?ut=5Fdata=20=D0=BD=D0=B0=20istream?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 laba01upd3.cpp | 30 +++++++++---------------------
 1 file changed, 9 insertions(+), 21 deletions(-)

diff --git a/laba01upd3.cpp b/laba01upd3.cpp
index 896ae34..4f427d5 100644
--- a/laba01upd3.cpp
+++ b/laba01upd3.cpp
@@ -1,7 +1,6 @@
 #include <iostream>
 #include <vector>
 #include "histogram.h"
-#include "histogram_internal.h"
 #include "svg.h"
 #include "text.h"
 #include <string>
@@ -13,35 +12,24 @@ struct Input {
     size_t bin_count{};
 };
 
-Input input_data() {
-    size_t number_count;
-    cerr << "Enter number count: ";
-    cin >> number_count;
-
+Input input_data(istream& in_stream) {
     Input in;
+    size_t number_count;
+    in_stream >> number_count;
     in.numbers.resize(number_count);
-    cerr << "Enter " << number_count << " numbers: ";
     for (size_t i = 0; i < number_count; i++) {
-        cin >> in.numbers[i];
+        in_stream >> in.numbers[i];
     }
-
-    cerr << "Enter bin count: ";
-    cin >> in.bin_count;
-
+    in_stream >> in.bin_count;
     return in;
 }
 
-int main() {
-    auto in = input_data();
 
-    double min_val, max_val;
-    find_minmax(in.numbers, min_val, max_val);
-
-    double bin_size = compute_bin_size(in.numbers, in.bin_count);
+int main(int argc, char* argv[]) {
+    auto in = input_data(cin);
     auto bins = make_histogram(in.numbers, in.bin_count);
-
-    show_histogram_svg(bins, bin_size, min_val);
-
+    show_histogram_svg(bins);
     show_histogram_text(bins);
+
     return 0;
 }