From f2ee8e9d8afadbc6fb5e21cdd7a572747703dd2e Mon Sep 17 00:00:00 2001
From: LykovaYA <LykovaYA@mpei.ru>
Date: Thu, 21 Nov 2024 21:19:35 +0300
Subject: [PATCH] =?UTF-8?q?code:=20=D0=92=D1=8B=D0=B2=D0=BE=D0=B4=20=D1=86?=
 =?UTF-8?q?=D0=B2=D0=B5=D1=82=D0=BD=D0=BE=D0=B3=D0=BE=20=D0=B8=D0=B7=D0=BE?=
 =?UTF-8?q?=D0=B1=D1=80=D0=B0=D0=B6=D0=B5=D0=BD=D0=B8=D1=8F=20svg?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 lab34.cpp | 78 ++++---------------------------------------------------
 1 file changed, 5 insertions(+), 73 deletions(-)

diff --git a/lab34.cpp b/lab34.cpp
index f09de01..b2cebe9 100644
--- a/lab34.cpp
+++ b/lab34.cpp
@@ -1,11 +1,12 @@
 #include <iostream>
 #include <vector>
+#include "histogram.h"
+#include "text.h"
+#include "histogram_internal.h"
+#include "svg.h"
 
 using namespace std;
 
-const size_t SCREEN_WIDTH = 80;
-const size_t MAX_ASTERISK = SCREEN_WIDTH - 3 - 1;
-
 struct Input {
     vector<double> numbers;
     size_t bin_count{};
@@ -25,79 +26,10 @@ input_data() {
     return in;
 }
 
-void
-find_minmax(const vector<double>& numbers, double& min, double& max) {
-    min = numbers[0];
-    for (size_t i = 1; i < numbers.size(); i++) {
-        if (numbers[i] < min) {
-            min = numbers[i];
-        }
-        else if (numbers[i] > max) {
-            max = numbers[i];
-        }
-    }
-}
-
-vector<size_t>
-make_histogram(const vector <double>& numbers, size_t bin_count) {
-    double minc, maxc;
-    find_minmax(numbers, minc, maxc);
-    vector<size_t> bins(bin_count);
-    double bin_size = (maxc - minc) / bin_count;
-    size_t bin_max_size = 0;
-    for (size_t i = 0; i < numbers.size(); i++) {
-        bool found = false;
-        for (size_t j = 0; (j < bin_count - 1) && !found; j++) {
-            auto lo = minc + j * bin_size;
-            auto hi = minc + (j + 1) * bin_size;
-            if ((lo <= numbers[i]) && (numbers[i] < hi)) {
-                bins[j]++;
-                found = true;
-                if (bins[j] > bin_max_size) {
-                    bin_max_size = bins[j];
-                }
-            }
-        }
-        if (!found) {
-            bins[bin_count - 1]++;
-            if (bins[bin_count - 1] > bin_max_size) {
-                bin_max_size = bins[bin_count - 1];
-            }
-        }
-    }
-    return bins;
-}
-
-void
-show_histogram_text(vector<size_t> bins) {
-    size_t bin_max_size = 0;
-    for (auto bin : bins) {
-        if (bin_max_size < bin) {
-            bin_max_size = bin;
-        }
-    }
-    double k = double(MAX_ASTERISK) / bin_max_size;
-    if (k > 1) {
-        k = 1;
-    }
-    for (size_t bin = 0; bin < bins.size(); bin++) {
-        if (bins[bin] < 100) {
-            cout << " ";
-        }
-        if (bins[bin] < 10) {
-            cout << " ";
-        }
-        cout << bins[bin] << "|";
-        for (size_t i = 0; i < bins[bin] * k; i++) {
-            cout << "*";
-        }
-        cout << endl;
-    }
-}
-
 int main() {
     Input in = input_data();
     auto bins = make_histogram(in.numbers, in.bin_count);
     show_histogram_text(bins);
+    show_histogram_svg(bins);
     return 0;
 }
\ No newline at end of file