From 3e399b7928c633bed3628e4feff4a2812502ba66 Mon Sep 17 00:00:00 2001
From: "PARZIVAL (BreganIM)" <BreganIM@mpei.ru>
Date: Thu, 1 May 2025 21:23:21 +0300
Subject: [PATCH] =?UTF-8?q?code:=D0=A3=D0=B1=D1=80=D0=B0=D0=BD=D1=8B=20?=
 =?UTF-8?q?=D0=BB=D0=B8=D1=88=D0=BD=D0=B8=D0=B5=20=D1=84=D1=83=D0=BD=D0=BA?=
 =?UTF-8?q?=D1=86=D0=B8=D0=B8=20=D0=B8=D0=B7=20=D0=B3=D0=BB=D0=B0=D0=B2?=
 =?UTF-8?q?=D0=BD=D0=BE=D0=B3=D0=BE=20=D1=84=D0=B0=D0=B9=D0=BB=D0=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 laba01upd3.cpp | 66 ++------------------------------------------------
 1 file changed, 2 insertions(+), 64 deletions(-)

diff --git a/laba01upd3.cpp b/laba01upd3.cpp
index c08fd3a..06e0dfd 100644
--- a/laba01upd3.cpp
+++ b/laba01upd3.cpp
@@ -1,10 +1,10 @@
 #include <iostream>
 #include <vector>
+#include "histogram.h"
+#include "text.h"
 
 using namespace std;
 
-const size_t SCREEN_WIDTH = 80;
-const size_t MAX_ASTERISK = SCREEN_WIDTH - 3 - 1;
 
 struct Input {
     vector<double> numbers;
@@ -29,68 +29,6 @@ Input input_data() {
     return in;
 }
 
-void find_minmax(const vector<double>& numbers, double& min, double& max) {
-    min = numbers[0];
-    max = numbers[0];
-    for (double x : numbers) {
-        if (x < min)
-            min = x;
-        if (x > max)
-            max = x;
-    }
-}
-
-vector<size_t> make_histogram(const vector<double>& numbers, size_t bin_count) {
-    vector<size_t> bins(bin_count, 0);
-    double min, max;
-    find_minmax(numbers, min, max);
-    double bin_size = (max - min) / bin_count;
-
-    for (size_t i = 0; i < numbers.size(); i++) {
-        bool found = false;
-        
-        for (size_t j = 0; j < bin_count - 1 && !found; j++) {
-            double lo = min + j * bin_size;
-            double hi = min + (j + 1) * bin_size;
-            if (numbers[i] >= lo && numbers[i] < hi) {
-                bins[j]++;
-                found = true;
-            }
-        }
-        
-        if (!found)
-            bins[bin_count - 1]++;
-    }
-    return bins;
-}
-
-void show_histogram_text(const vector<size_t>& bins) {
-    
-    size_t max_count = bins[0];
-    for (size_t count : bins) {
-        if (count > max_count)
-            max_count = count;
-    }
-    for (size_t j = 0; j < bins.size(); j++) {
-        if (bins[j] < 100)
-            cout << " ";
-        if (bins[j] < 10)
-            cout << " ";
-        cout << bins[j] << "|";
-
-        size_t height = 0;
-        if (max_count > MAX_ASTERISK) {
-            height = static_cast<size_t>(static_cast<double>(bins[j]) / max_count * MAX_ASTERISK);
-        }
-        else {
-            height = bins[j];
-        }
-        for (size_t i = 0; i < height; i++) {
-            cout << "*";
-        }
-        cout << endl;
-    }
-}
 
 int main() {
     auto in = input_data();