From 542a96b3a59dd9fb334445fe9242bbe0c1c00ce9 Mon Sep 17 00:00:00 2001
From: "lab01 (IvanovIM)" <IvanovIvM@mpei.ru>
Date: Sat, 23 Mar 2024 23:01:54 +0300
Subject: [PATCH] =?UTF-8?q?code:=20=D0=92=D0=B2=D0=BE=D0=B4=20=D0=B8=D0=B7?=
 =?UTF-8?q?=20=D0=BF=D1=80=D0=BE=D0=B8=D0=B7=D0=B2=D0=BE=D0=BB=D1=8C=D0=BD?=
 =?UTF-8?q?=D0=BE=D0=B3=D0=BE=20=D0=BF=D0=BE=D1=82=D0=BE=D0=BA=D0=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 main.cpp | 90 +++++++++++++-------------------------------------------
 1 file changed, 20 insertions(+), 70 deletions(-)

diff --git a/main.cpp b/main.cpp
index 8a4ddac..ee25bfb 100644
--- a/main.cpp
+++ b/main.cpp
@@ -1,6 +1,11 @@
 #include <iostream>
 #include <vector>
 
+#include "histogram.h"
+#include "text.h"
+#include "svg.h"
+
+
 using namespace std;
 
  struct Input {
@@ -11,98 +16,43 @@ using namespace std;
 };
 
 Input
-input_data(){
+input_data(istream& in){  //& тк нельзя скопировать поток ввода   istream управляет извлечением объектов
 
     setlocale(LC_ALL, "RUSSIAN");
 
-    size_t number_count;
+    Input in2;
+
     cerr << "Введите количество чисел: ";
-    cin >> number_count;
+    in >> in2.number_count;
 
-    Input in;
 
-    in.numbers.resize(number_count);
+
+    in2.numbers.resize(in2.number_count);
 
     cerr << "Введите через пробел элементы массива: ";
 
-    vector<double> numbers(number_count);
-    for (size_t i = 0; i < number_count; i++) {
-        cin >> in.numbers[i];
+    vector<double> numbers(in2.number_count);
+    for (size_t i = 0; i < in2.number_count; i++) {
+        in >> in2.numbers[i];
     }
 
     size_t bin_count;
     cerr << "Введите количество корзин: ";
-    cin >> in.bin_count;
+    in >> in2.bin_count;
 
-    return in;
+    return in2;
 };
 
-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;
-        }
-        else if (x > max) {
-            max = x;
-        }
-    }
-}
-
-auto
-make_histogram(const vector<double> numbers, size_t bin_count){
-
-    vector <size_t> bins(bin_count);
-    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++) {
-            auto lo = min + j * bin_size;
-            auto hi = min + (j + 1) * bin_size;
-            if ((lo <= numbers[i]) && (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 number_count, size_t bin_count){
-
-    for (size_t i = 0; i < bin_count; i++){
-
-        if (bins[i] < 100) cout << " ";
-        if (bins[i] < 10) cout << " ";
-        cout << bins[i] << "|";
-
-        for(size_t j=0; j < bins[i]; j++){
-                    cout << "*";
-        }
-         cout<<endl;
-    }
-}
-
 
 int
 main(){
 
-    auto in = input_data();
+    auto in = input_data(cin);
     auto bins = make_histogram(in.numbers, in.bin_count);
     show_histogram_text(bins, in.number_count, in.bin_count);
 
     return 0;
 }
+
+
+// cin - переменная которая представляет поток