добавлен doctest.h в каталог проекта

main.cpp

@@ -1,6 +1,8 @@
 #include <vector>
 #include <iostream>
 #include<cmath>
+#include "histogram.h"
+
 
 using namespace std;
 
@@ -49,65 +51,12 @@ cin >> in.bin_count;
     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;
-        }
-    }
-}
 
-std::vector<double>
-make_histogram(const std::vector<double>& numbers, size_t bin_count) {
-    vector<double> bins(bin_count);
 
-    double min = 0, max = 0;
-    find_minmax(numbers, min, max);
 
-    double bin_size = (max - min) / bin_count;
-    for (int i = 0; i < numbers.size(); i++) {
-        bool found = false;
-        for (int 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;
-}
 
-int main()
+void show_histogram_text (const std::vector<double>& bins, size_t MAX_ASTERISK, size_t bin_count)
 {
-    auto in = input_data();
-
-    double min, max;
-
-    find_minmax(in.numbers, min, max);
-
-
-
-	const size_t MAX_ASTERISK = in.SCREEN_WIDTH - 3 - 1;
-
-
-
-auto bins = make_histogram(in.numbers, in.bin_count);
-
-
-
-
-
     double mxbins = bins[0];
 
     for (double x : bins)
@@ -121,7 +70,7 @@ auto bins = make_histogram(in.numbers, in.bin_count);
         k = MAX_ASTERISK / mxbins;
     else
         k = 1;
-	for (size_t i = 0; i < in.bin_count; i++)
+    for (size_t i = 0; i < bin_count; i++)
     {
         if (bins[i] < 10) {
             cout << "  " << bins[i] << "|";
@@ -142,3 +91,24 @@ auto bins = make_histogram(in.numbers, in.bin_count);
     }
 }
 
+int main()
+{
+    auto in = input_data();
+
+    double min, max;
+
+
+
+
+    const size_t MAX_ASTERISK = in.SCREEN_WIDTH - 3 - 1;
+
+
+
+auto bins = make_histogram(in.numbers, in.bin_count);
+
+
+show_histogram_text(bins, MAX_ASTERISK, in.bin_count);
+
+
+
+}