From b31bbe8722dbb65742eb992db4cfae0e5e132279 Mon Sep 17 00:00:00 2001
From: "Artyom (StepanovAV)" <StepanovAV@mpei.ru>
Date: Sat, 20 Apr 2024 15:52:42 +0300
Subject: [PATCH] =?UTF-8?q?code:=20=D1=80=D0=B0=D1=81=D1=87=D0=B5=D1=82=20?=
 =?UTF-8?q?=D0=B3=D0=B8=D1=81=D1=82=D0=BE=D0=B3=D1=80=D0=B0=D0=BC=D0=BC?=
 =?UTF-8?q?=D1=8B=20=D0=B8=20=D0=B5=D1=91=20=D0=B2=D1=8B=D0=B2=D0=BE=D0=B4?=
 =?UTF-8?q?=20=D0=BD=D0=B0=20=D1=8D=D0=BA=D1=80=D0=B0=D0=BD=20=D0=B2=D1=8B?=
 =?UTF-8?q?=D0=B2=D0=B5=D0=B4=D0=B5=D0=BD=D1=8B=20=D0=B2=20=D0=BE=D1=82?=
 =?UTF-8?q?=D0=B4=D0=B5=D0=BB=D1=8C=D0=BD=D1=83=D1=8E=20=D1=84=D1=83=D0=BD?=
 =?UTF-8?q?=D0=BA=D1=86=D0=B8=D1=8E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 main.cpp | 34 +++++++++++++++++++++-------------
 1 file changed, 21 insertions(+), 13 deletions(-)

diff --git a/main.cpp b/main.cpp
index 2b29275..1a64a25 100644
--- a/main.cpp
+++ b/main.cpp
@@ -37,32 +37,34 @@ find_minmax(const std::vector<double>& numbers, double& min, double& max){
         }
     }
 }
-int
-main() {
-    size_t i, j;
+vector<size_t>
+make_histogram(const std::vector<double>& numbers, size_t bin_count){
     double min, max;
-    Input in = input_data();
-    find_minmax (in.numbers, min, max);
-    double bin_size = (max - min) / in.bin_count;
-    vector<size_t> bins(in.bin_count);
-    for (auto x : in.numbers) {
+    find_minmax (numbers, min, max);
+    double bin_size = (max - min) / bin_count;
+    std::vector<size_t> bins(bin_count);
+    for (auto x : numbers) {
         bool found = false;
-        for (j = 0; (j < (in.bin_count - 1) && !found); j++) {
-            if (min + j * bin_size <= x && (x < min + (j + 1) * bin_size)) {
+        for (size_t j = 0; (j < bin_count - 1) && !found ; j++) {
+            if ((min + j * bin_size <= x) && (x < min + (j + 1) * bin_size)) {
                 bins[j] += 1;
                 found = true;
             }
         }
-        if (!found) bins[in.bin_count - 1]++;
+        if (!found) bins[bin_count - 1]++;
     }
+    return bins;
+}
+void
+show_histogram_text(vector<size_t> bins, size_t bin_count ){
     auto max_count = bins[0];
     for (auto x : bins) {
         if (x > max_count) {
             max_count = x;
         }
     }
-    for (i = 0; i < in.bin_count; i++) {
-        j = 100;
+    for (size_t i = 0; i < bin_count; i++) {
+        size_t j = 100;
         while (bins[i] < j) {
             cout << " ";
             j /= 10;
@@ -86,5 +88,11 @@ main() {
         }
         cout << endl;
     }
+}
+int
+main() {
+    Input in = input_data();
+    auto bins = make_histogram(in.numbers, in.bin_count);
+    show_histogram_text(bins, in.bin_count);
     return 0;
 }