From 6ef0b93ceda4865be17291f5475d226e157fb650 Mon Sep 17 00:00:00 2001
From: MatusSV <MatusSV@mpei.ru>
Date: Mon, 13 May 2024 10:00:19 +0300
Subject: [PATCH] =?UTF-8?q?code:=20=D0=BC=D0=BE=D0=B4=D1=83=D0=BB=D1=8C?=
 =?UTF-8?q?=D0=BD=D1=8B=D0=B5=20=D1=82=D0=B5=D1=81=D1=82=D1=8B;=20=D1=83?=
 =?UTF-8?q?=D0=BB=D1=83=D1=87=D1=88=D0=B5=D0=BD=D1=8B=20=D1=84=D1=83=D0=BD?=
 =?UTF-8?q?=D0=BA=D1=86=D0=B8=D0=B8=20=D1=80=D0=B0=D1=81=D1=87=D0=B5=D1=82?=
 =?UTF-8?q?=D0=B0=20=D0=B8=20=D0=BF=D0=B5=D1=87=D0=B0=D1=82=D0=B8=20=D0=B3?=
 =?UTF-8?q?=D0=B8=D1=81=D1=82=D0=BE=D0=B3=D1=80=D0=B0=D0=BC=D0=BC=D1=8B=20?=
 =?UTF-8?q?=D0=B4=D0=BB=D1=8F=20=D1=81=D0=BB=D1=83=D1=87=D0=B0=D1=8F=20?=
 =?UTF-8?q?=D1=81=20=D0=BF=D1=83=D1=81=D1=82=D1=8B=D0=BC=20=D0=B2=D0=B5?=
 =?UTF-8?q?=D0=BA=D1=82=D0=BE=D1=80=D0=BE=D0=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Lab1.cbp             |  6 +++++
 histogram.cpp        | 42 ++++++++++++++++++++++++++--------
 histogram_internal.h |  9 ++++++++
 text.cpp             |  5 ++++
 unittest.cpp         | 54 ++++++++++++++++++++++++++++++++++++++++++++
 5 files changed, 107 insertions(+), 9 deletions(-)
 create mode 100644 histogram_internal.h
 create mode 100644 unittest.cpp

diff --git a/Lab1.cbp b/Lab1.cbp
index 97bdf05..0277582 100644
--- a/Lab1.cbp
+++ b/Lab1.cbp
@@ -32,8 +32,14 @@
 			<Add option="-Wall" />
 			<Add option="-fexceptions" />
 		</Compiler>
+		<Unit filename=".gitignore" />
+		<Unit filename="histogram.cpp" />
+		<Unit filename="histogram.h" />
+		<Unit filename="histogram_internal.h" />
 		<Unit filename="main.cpp" />
 		<Unit filename="main.h" />
+		<Unit filename="text.cpp" />
+		<Unit filename="text.h" />
 		<Extensions />
 	</Project>
 </CodeBlocks_project_file>
diff --git a/histogram.cpp b/histogram.cpp
index d526eb7..0bcaa87 100644
--- a/histogram.cpp
+++ b/histogram.cpp
@@ -2,16 +2,28 @@
 
 using namespace std;
 
-static void
-find_minmax(const vector<double>& numbers, double& min, double& max)
+void
+find_minmax(const vector<double>& numbers, double& min, double& max, bool& empty_vector)
 {
-    min = numbers[0];
-    max = numbers[0];
-    // (здесь код поиска минимума и максимума)
-    for (double value : numbers)
+    if (numbers.empty())
     {
-        if (value < min) {min = value;}
-        else if (value > max) {max = value;}
+        empty_vector = true;
+    }
+    else
+    {
+        min = numbers[0];
+        max = numbers[0];
+        for (double x : numbers)
+        {
+            if (x > max )
+            {
+                max = x;
+            }
+            if (x < min)
+            {
+                min = x;
+            }
+        }
     }
 }
 
@@ -19,10 +31,22 @@ vector<size_t>
 make_histogram(const vector<double>& numbers, size_t& bin_count)
 {
     double min, max;
-    find_minmax(numbers, min, max);
+    bool empty_vector = false;
+    find_minmax(numbers, min, max, empty_vector);
+
 
     double bin_size = (max - min) / bin_count;
     vector<size_t> bins(bin_count);
+
+    if (empty_vector)
+    {
+        for (size_t y : bins)
+        {
+            y = 0;
+        }
+    }
+
+
     for (size_t i = 0; i < numbers.size(); i++)
     {
         for (size_t j = i + 1; j < numbers.size(); j++)
diff --git a/histogram_internal.h b/histogram_internal.h
new file mode 100644
index 0000000..8f2b497
--- /dev/null
+++ b/histogram_internal.h
@@ -0,0 +1,9 @@
+#ifndef HISTOGRAM_INTERNAL_H_INCLUDED
+#define HISTOGRAM_INTERNAL_H_INCLUDED
+
+#include <vector>
+
+void
+find_minmax(const std::vector<double>& numbers, double& min, double& max, bool& empty_vector);
+
+#endif // HISTOGRAM_INTERNAL_H_INCLUDED
diff --git a/text.cpp b/text.cpp
index aceb930..011f6ff 100644
--- a/text.cpp
+++ b/text.cpp
@@ -17,6 +17,11 @@ show_histogram_text(const vector<size_t>& bins, size_t& bin_count) {
         }
     }
 
+    if (max_count == 0)
+    {
+        max_count = 1;
+    }
+
     for (size_t bin : bins)
     {
         if (bin < 100) cout << " ";
diff --git a/unittest.cpp b/unittest.cpp
new file mode 100644
index 0000000..74f357e
--- /dev/null
+++ b/unittest.cpp
@@ -0,0 +1,54 @@
+#define DOCTEST_CONFIG_NO_MULTITHREADING
+#define DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN
+#include "doctest.h"
+#include "histogram_internal.h"
+
+TEST_CASE("distinct positive numbers") {
+    double min = 0;
+    double max = 0;
+    bool empty_vector = false;
+    find_minmax({1, 2}, min, max, empty_vector);
+    CHECK(empty_vector == false);
+    CHECK(min == 1);
+    CHECK(max == 2);
+}
+
+TEST_CASE("single number") {
+    double min = 0;
+    double max = 0;
+    bool empty_vector = false;
+    find_minmax({1}, min, max, empty_vector);
+    CHECK(empty_vector == false);
+    CHECK(min == 1);
+    CHECK(max == 1);
+}
+
+TEST_CASE("negative numbers") {
+    double min = 0;
+    double max = 0;
+    bool empty_vector = false;
+    find_minmax({-1, -2}, min, max, empty_vector);
+    CHECK(empty_vector == false);
+    CHECK(min == -2);
+    CHECK(max == -1);
+}
+
+TEST_CASE("identical numbers") {
+    double min = 0;
+    double max = 0;
+    bool empty_vector = false;
+    find_minmax({2, 2}, min, max, empty_vector);
+    CHECK(empty_vector == false);
+    CHECK(min == 2);
+    CHECK(max == 2);
+}
+
+TEST_CASE("empty vector") {
+    double min = 0;
+    double max = 0;
+    bool empty_vector = false;
+    find_minmax({}, min, max, empty_vector);
+    CHECK(empty_vector == true);
+    CHECK(min == 0);
+    CHECK(max == 0);
+}