From 0ee2bcf9031ac17c932910ce68267b2f7d3dc514 Mon Sep 17 00:00:00 2001
From: "lab34 (BakaikinKV)" <BakaikinKV@mpei.ru>
Date: Wed, 16 Apr 2025 17:53:48 +0300
Subject: [PATCH] =?UTF-8?q?=D0=B4=D0=BE=D0=B1=D0=B0=D0=B2=D0=B8=D0=BB=20.c?=
 =?UTF-8?q?pp=20=D0=B8=20.h=20=D0=B8=20=D0=B8=D0=B7=D0=BC=D0=B5=D0=BD?=
 =?UTF-8?q?=D0=B8=D0=BB=20main.cpp?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 histogram.cpp | 52 +++++++++++++++++++++++++++++++++++++++++++++++++++
 histogram.h   |  7 +++++++
 main.cpp      | 46 +++------------------------------------------
 3 files changed, 62 insertions(+), 43 deletions(-)
 create mode 100644 histogram.cpp
 create mode 100644 histogram.h

diff --git a/histogram.cpp b/histogram.cpp
new file mode 100644
index 0000000..728e7a3
--- /dev/null
+++ b/histogram.cpp
@@ -0,0 +1,52 @@
+#include <iostream>
+#include <vector>
+#include "histogram.h"
+using namespace std;
+
+void static find_minmax(const vector<double> &numbers, double &min, double &max)
+{
+    min = numbers[0];
+    max = numbers[0];
+    for(double number : numbers)
+    {
+        if(number < min)
+        {
+            min = number;
+        }
+        if(number > max)
+        {
+            max = number;
+        }
+    }
+    return;
+
+}
+
+std::vector<size_t> make_histogram(std::vector<double>& numbers, size_t bin_count)
+{
+
+    double min;
+    double max;
+    find_minmax (numbers, min, max);
+    double bin_size = (max - min) / bin_count;
+    vector<size_t> bins(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;
+}
diff --git a/histogram.h b/histogram.h
new file mode 100644
index 0000000..c68033a
--- /dev/null
+++ b/histogram.h
@@ -0,0 +1,7 @@
+#ifndef HISTOGRAM_H_INCLUDED
+#define HISTOGRAM_H_INCLUDED
+#include <vector>
+
+std::vector<size_t> make_histogram(std::vector<double>& numbers, size_t bin_count);
+
+#endif // HISTOGRAM_H_INCLUDED
diff --git a/main.cpp b/main.cpp
index 83abf99..c30f1fb 100644
--- a/main.cpp
+++ b/main.cpp
@@ -1,6 +1,6 @@
 #include <iostream>
 #include <vector>
-
+#include "histogram.h"
 using namespace std;
 
 struct Input {
@@ -25,48 +25,8 @@ input_data(){
     return in;
 }
 
-void find_minmax(const vector<double> &numbers, double &min, double &max){
-    min = numbers[0];
-    max = numbers[0];
-    for(double number : numbers)
-    {
-        if(number < min)
-        {
-            min = number;
-        }
-        if(number > max)
-        {
-            max = number;
-        }
-    }
-    return;
-}
-vector<size_t> make_histogram (vector<double> numbers, size_t bin_count){
-    double min;
-    double max;
-    find_minmax (numbers, min, max);
-    double bin_size = (max - min) / bin_count;
-    vector<size_t> bins(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(vector<size_t> bins, size_t bin_count){
     const size_t SCREEN_WIDTH = 80;
     const size_t MAX_ASTERISK = SCREEN_WIDTH - 3 - 1;