From c6b6f0c0b23adeb1859c4c512e2b99401e4b5276 Mon Sep 17 00:00:00 2001
From: KhokhlovKR <KhokhlovKR@mpei.ru>
Date: Sun, 23 Apr 2023 23:38:39 +0300
Subject: [PATCH] =?UTF-8?q?code:=D0=B4=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5?=
 =?UTF-8?q?=D0=BD=D0=B0=20=D1=86=D0=B2=D0=B5=D1=82=D0=BD=D0=B0=D1=8F=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?=D0=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 laba1cb/lab1final/main.cpp | 83 +++-----------------------------------
 1 file changed, 5 insertions(+), 78 deletions(-)

diff --git a/laba1cb/lab1final/main.cpp b/laba1cb/lab1final/main.cpp
index 6e978b1..4713024 100644
--- a/laba1cb/lab1final/main.cpp
+++ b/laba1cb/lab1final/main.cpp
@@ -1,10 +1,11 @@
 #include <iostream>
 #include <cmath>
 #include <vector>
+#include "histogram.h"
+#include "text.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;
@@ -33,88 +34,14 @@ cin >> in.bin_count;
 return in;
 }
 
-void
-find_minmax(const vector<double>& numbers, double &min, double &max)
-{
-
-    min = numbers[0];
-    max = numbers[0];
-    for (size_t i = 0; i < numbers.size(); i++)
-    {
-        if (numbers[i] > max)
-            max = numbers[i];
-        if (numbers[i] < min)
-            min = numbers[i];
-    }
-}
-
-vector <size_t> make_histogram (const vector<double>& numbers, size_t &bin_count)
-{
-   vector <size_t> bins(bin_count);
-
-   double min, max;
-   float low, hi;
-
-   find_minmax(numbers, min, max);
-
-   double bin_size = (max - min) / bin_count;
-   low = min;
-    hi = low + bin_size;
-
-    for (size_t i = 0; i < numbers.size(); i++)
-    {
-        bool found = false;
-
-        for (size_t j = 0; (j < bin_count - 1) && !found; j++)
-        {
-            low = min + j * bin_size;
-            hi = min + (j + 1) * bin_size;
-            if ((low <= numbers[i]) && (numbers[i] < hi))
-            {
-                bins[j]++;
-                found = true;
-            }
-        }
-        if (found==false)
-        {
-            bins[bin_count - 1]++;
-        }
-    }
-    return bins;
-}
-
-void show_histogram_text(const vector<size_t>& bins, size_t &bin_count)
-{
-
-size_t max_bin = bins[0];
-for (size_t bin : bins)
-if (bin > max_bin)
-max_bin = bin;
-for (size_t bin : bins)
-{
-int height = bin;
-if (max_bin > MAX_ASTERISK)
-{
-height = MAX_ASTERISK * (static_cast<double>(bin) / max_bin);
-}
-if (bin < 100)
-cout << " ";
-if (bin < 10)
-cout << " ";
-cout << bin << "|";
-for (int i = 0; i < height; i++)
-cout << "*";
-cout << endl;
-}
-}
-
 
 int main()
 {
 
     auto in = input_data();
     auto bins = make_histogram(in.numbers, in.bin_count);
-    show_histogram_text(bins, in.bin_count);
+     show_histogram_svg(bins);
+   /* show_histogram_text(bins, in.bin_count);*/
 
     return 0;
 }