code: добавлена библиотека для модульного тестирования

histogram.cpp

@@ -0,0 +1,109 @@
+#include "histogram.h"
+
+void find_minmax(const std::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;
+    	}
+	}
+    return;
+}
+
+std::vector<size_t> make_histogram(const std::vector<double>& numbers, size_t& bin_count) {
+    double minn, maxn;
+    find_minmax(numbers, minn, maxn);
+    double bin_size = (maxn - minn) / bin_count;
+    std::vector<size_t> bins(bin_count, 0);
+    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 = minn + j * bin_size;
+            auto hi = minn + (j + 1) * bin_size;
+            if ((numbers[i] >= lo) && (numbers[i] <= hi)) {
+                bins[j]++;
+                found = true;
+            }
+        }
+        if (!found) {
+            bins[bin_count - 1]++;
+        }
+    }
+    return bins;
+}
+
+void show_histogram_text(const std::vector<size_t> bins, size_t bin_count) {
+    size_t max_count = bins[0];
+    for (size_t i = 1; i < bin_count; i++) {
+        if (bins[i] > max_count) {
+            max_count = bins[i];
+        }
+    }
+
+    const size_t SCREEN_WIDTH = 80;
+    const size_t MAX_ASTERISK = SCREEN_WIDTH - 3 - 1;
+
+
+    short space_count;
+
+    std::cerr << "\nHistogram:" << std::endl;
+
+    if (max_count <= MAX_ASTERISK) {
+        for (size_t i = 0; i < bin_count; i++) {
+            if (bins[i] < 10) {
+                space_count = 2;
+            } else if (bins[i] >= 10 && bins[i] < 100) {
+                space_count = 1;
+            } else if (bins[i] >= 100 && bins[i] < 1000) {
+                space_count = 0;
+            }
+
+
+
+            for (size_t k = 0; k < space_count; k++) {
+                std::cout << " ";
+            }
+
+            std::cout << bins[i];
+
+            std::cout << "|";
+
+
+            for (size_t j = 0; j < bins[i]; j++) {
+                std::cout << "*";
+            }
+
+            std::cout << "\n";
+        }
+    } else {
+        for (size_t i = 0; i < bin_count; i++) {
+            if (bins[i] < 10) {
+                space_count = 2;
+            } else if (bins[i] >= 10 && bins[i] < 100) {
+                space_count = 1;
+            } else if (bins[i] >= 100 && bins[i] < 1000) {
+                space_count = 0;
+            }
+
+
+            for (size_t k = 0; k < space_count; k++) {
+                std::cout << " ";
+            }
+
+            std::cout << bins[i];
+
+            std::cout << "|";
+
+            size_t height = static_cast<size_t>(MAX_ASTERISK * (static_cast<double>(bins[i]) / max_count));
+            for (size_t j = 0; j < height; j++) {
+                std::cout << "*";
+            }
+
+            std::cout << "\n";
+        }
+    }
+}

histogram.h

@@ -0,0 +1,10 @@
+#ifndef HISTOGRAM_H_INCLUDED
+#define HISTOGRAM_H_INCLUDED
+#include <iostream>
+#include <vector>
+#include <math.h>
+
+std::vector<size_t> make_histogram(const std::vector<double>& numbers, size_t& bin_count);
+void show_histogram_text(const std::vector<size_t> bins, size_t bin_count);
+
+#endif // HISTOGRAM_H_INCLUDED

histogram_internal.h

@@ -0,0 +1,6 @@
+#ifndef HISTOGRAM_INTERNAL_H_INCLUDED
+#define HISTOGRAM_INTERNAL_H_INCLUDED
+
+void find_minmax(const std::vector<double>& numbers, double& min, double& max);
+
+#endif // HISTOGRAM_INTERNAL_H_INCLUDED

main.cpp

@@ -1,7 +1,4 @@
-#include <iostream>
-#include <vector>
-#include <math.h>
-#pragma once
+#include "histogram.h"
 
 using namespace std;
 
@@ -22,114 +19,6 @@ Input input_data(){
     return in;
 }
 
-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;
-    	}
-	}
-    return;
-}
-
-vector<size_t> make_histogram(const vector<double>& numbers, size_t& bin_count) {
-    double minn, maxn;
-    find_minmax(numbers, minn, maxn);
-    double bin_size = (maxn - minn) / bin_count;
-    vector<size_t> bins(bin_count, 0);
-    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 = minn + j * bin_size;
-            auto hi = minn + (j + 1) * bin_size;
-            if ((numbers[i] >= lo) && (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 bin_count) {
-    size_t max_count = bins[0];
-    for (size_t i = 1; i < bin_count; i++) {
-        if (bins[i] > max_count) {
-            max_count = bins[i];
-        }
-    }
-
-    const size_t SCREEN_WIDTH = 80;
-    const size_t MAX_ASTERISK = SCREEN_WIDTH - 3 - 1;
-
-
-    short space_count;
-
-    cerr << "\nHistogram:" << endl;
-
-    if (max_count <= MAX_ASTERISK) {
-        for (size_t i = 0; i < bin_count; i++) {
-            if (bins[i] < 10) {
-                space_count = 2;
-            } else if (bins[i] >= 10 && bins[i] < 100) {
-                space_count = 1;
-            } else if (bins[i] >= 100 && bins[i] < 1000) {
-                space_count = 0;
-            }
-
-
-
-            for (size_t k = 0; k < space_count; k++) {
-                cout << " ";
-            }
-
-            cout << bins[i];
-
-            cout << "|";
-
-
-            for (size_t j = 0; j < bins[i]; j++) {
-                cout << "*";
-            }
-
-            cout << "\n";
-        }
-    } else {
-        for (size_t i = 0; i < bin_count; i++) {
-            if (bins[i] < 10) {
-                space_count = 2;
-            } else if (bins[i] >= 10 && bins[i] < 100) {
-                space_count = 1;
-            } else if (bins[i] >= 100 && bins[i] < 1000) {
-                space_count = 0;
-            }
-
-
-            for (size_t k = 0; k < space_count; k++) {
-                cout << " ";
-            }
-
-            cout << bins[i];
-
-            cout << "|";
-
-            size_t height = static_cast<size_t>(MAX_ASTERISK * (static_cast<double>(bins[i]) / max_count));
-            for (size_t j = 0; j < height; j++) {
-                cout << "*";
-            }
-
-            cout << "\n";
-        }
-    }
-}
-
 int main() {
 
     auto in = input_data();