From 5af0fea54f6e47ee171a7f17dd5b0e06dbae6edd Mon Sep 17 00:00:00 2001
From: "Ivan (BeloziorovIA)" <BeloziorovIA@mpei.ru>
Date: Mon, 28 Apr 2025 14:49:29 +0300
Subject: [PATCH] =?UTF-8?q?code:=20=D0=B4=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB?=
 =?UTF-8?q?=D0=B5=D0=BD=D0=B8=D0=B5=20=D1=84=D1=83=D0=BD=D0=BA=D1=86=D0=B8?=
 =?UTF-8?q?=D0=B8=20=D1=81=D0=BE=D0=B7=D0=B4=D0=B0=D0=BD=D0=B8=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?=D1=8B=20(=D1=80=D0=B0=D1=81=D1=87=D1=91=D1=82=D0=B0=20bins)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 main.cpp | 36 ++++++++++++++++++++++--------------
 1 file changed, 22 insertions(+), 14 deletions(-)

diff --git a/main.cpp b/main.cpp
index 939aec7..fef940c 100644
--- a/main.cpp
+++ b/main.cpp
@@ -46,21 +46,26 @@ void find_minmax(const vector<double>& numbers, double& Min, double& Max){
 
 }
 
-/*
-	//Поиск максимума
-	double max = Numbers[0];
-	for (int i = 1; i < number_count; i++) {
-		if (Numbers[i] > max)
-			max = Numbers[i];
-	}
-	//Поиск минимума
-	double min = Numbers[0];
-	for (int i = 1; i < number_count; i++) {
-		if (Numbers[i] < min)
-			min = Numbers[i];
+//Функция расчёта гистограммы
+vector<size_t> make_histogram(vector<double> Numbers, size_t bin_count){
+    //Определение шага между корзинами
+    double Max, Min;
+    find_minmax(Numbers, Min, Max);
+	double bin_size = (Max-Min) / bin_count;
+	//Массив корзин
+	vector<size_t> bins(bin_count);
+	for (size_t i = 0; i < bin_count; i++) // обнуление корзин
+		bins[i] = 0;
+	for (size_t i = 0; i < bin_count; i++) {
+		double lo = Min + i * bin_size;
+		double hi = Min + (i + 1) * bin_size;
+		for (size_t j = 0; j < Numbers.size(); j++) {
+			if (lo <= Numbers[j] && Numbers[j] <= hi)
+				bins[i]++;
+		}
 	}
-
-	*/
+	return bins;
+}
 
 int main() {
     const size_t SCREEN_WIDTH = 80;
@@ -73,6 +78,9 @@ int main() {
 	double max, min;
 	find_minmax(in.Numbers, min, max);
 
+	//
+	vector<size_t> bins = make_histogram(in.Numbers, in.bin_count);
+
 	/*
 	//Определение шага между корзинами
 	double bin_size = (max - min) / bin_count;