добавлен doctest

histogram.cpp

@@ -0,0 +1,83 @@
+#include "histogram.h"
+#include <iostream>
+#include <limits>
+
+Input input_data() {
+    Input in;
+    size_t number_count;
+
+    std::cerr << "Enter number count: ";
+    std::cin >> number_count;
+
+    in.numbers.resize(number_count);
+    std::cerr << "Enter " << number_count << " numbers: ";
+    for (size_t i = 0; i < number_count; i++) {
+        std::cin >> in.numbers[i];
+    }
+
+    std::cerr << "Enter bin count: ";
+    std::cin >> in.bin_count;
+
+    return in;
+}
+
+void find_minmax(const std::vector<double>& numbers, double& min, double& max) {
+    min = std::numeric_limits<double>::max();
+    max = std::numeric_limits<double>::lowest();
+
+    for (double x : numbers) {
+        if (x < min) min = x;
+        if (x > max) max = x;
+    }
+}
+
+std::vector<size_t> make_histogram(const std::vector<double>& numbers, size_t bin_count) {
+    double min, max;
+    find_minmax(numbers, min, max);
+
+    if (max == min) {
+        return std::vector<size_t>(bin_count, numbers.size());
+    }
+
+    double bin_size = (max - min) / bin_count;
+    std::vector<size_t> bins(bin_count, 0);
+
+    for (double x : numbers) {
+        size_t bin_index = static_cast<size_t>((x - min) / bin_size);
+        if (bin_index >= bin_count) bin_index = bin_count - 1;
+        bins[bin_index]++;
+    }
+
+    return bins;
+}
+
+void show_histogram_text(const std::vector<size_t>& bins) {
+    const size_t SCREEN_WIDTH = 80;
+    const size_t MAX_ASTERISK = SCREEN_WIDTH - 3 - 1;
+    size_t max_count = 0;
+
+    for (size_t count : bins) {
+        if (count > max_count) max_count = count;
+    }
+
+    std::cerr << "Bin counts:" << std::endl;
+
+    for (size_t j = 0; j < bins.size(); j++) {
+        size_t height = (max_count > MAX_ASTERISK)
+            ? static_cast<size_t>(MAX_ASTERISK * (static_cast<double>(bins[j]) / max_count))
+            : bins[j];
+
+        if (bins[j] < 10) {
+            std::cout << "  " << bins[j] << "|";
+        }
+        else if (bins[j] < 100) {
+            std::cout << " " << bins[j] << "|";
+        }
+        else {
+            std::cout << bins[j] << "|";
+        }
+
+        for (size_t k = 0; k < height; k++) std::cout << "*";
+        std::cout << std::endl;
+    }
+}

histogram.h

@@ -0,0 +1,12 @@
+#pragma once
+
+#include <vector>
+
+struct Input {
+    std::vector<double> numbers;
+    size_t bin_count{};
+};
+
+Input input_data();
+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);

histogram_internal.h

@@ -0,0 +1,6 @@
+#ifndef HISTOGRAM_INTERNAL_H_INCLUDED
+#define HISTOGRAM_INTERNAL_H_INCLUDED
+
+
+
+#endif // HISTOGRAM_INTERNAL_H_INCLUDED

main.cpp

@@ -1,88 +1,8 @@
-#include <vector>
+#include "histogram.h"
-#include <iostream>
-#include <cstdlib>
-#include <ctime>
-#include <cmath>
-using namespace std;
-
-struct Input {
-    vector<double> numbers;
-    size_t bin_count{};
-};
-
-Input
-input_data() {
-    Input in;
-    size_t number_count;
-    cerr << "Enter number count: ";
-    cin >> number_count;
-    in.numbers.resize(number_count);
-    for (size_t i = 0; i < number_count; i++) {
-        cin >> in.numbers[i];
-    }
-    size_t bin_count;
-    cerr << "Enter bin count: ";
-    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;
-        }
-    }
-}
-
 
 int main() {
-    const size_t SCREEN_WIDTH = 80;
+    auto in = input_data();
-    const size_t MAX_ASTERISK = SCREEN_WIDTH - 3 - 1;
+    auto bins = make_histogram(in.numbers, in.bin_count);
-    Input in = input_data();
+    show_histogram_text(bins);
-    vector<size_t> bins(in.bin_count, 0);
-
-    double min, max;
-    find_minmax(in.numbers, min, max);
-
-
-    double bin_size = (max - min) / in.bin_count;
-
-    for (size_t i = 0; i < in.numbers.size(); i++) {
-        bool found = false;
-        for (size_t j = 0; (j < in.bin_count - 1) && !found; j++) {
-            auto lo = min + j * bin_size;
-            auto hi = min + (j + 1) * bin_size;
-            if ((lo <= in.numbers[i]) && (in.numbers[i] < hi)) {
-                bins[j]++;
-                found = true;
-            }
-        }
-        if (!found) {
-            bins[in.bin_count - 1]++;
-        }
-    }
-
-    size_t max_bin_count = 0;
-    for (size_t bin : bins) {
-        if (bin > max_bin_count) {
-            max_bin_count = bin;
-        }
-    }
-
-    for (size_t i = 0; i < in.bin_count; i++) {
-        cout << bins[i] << " |";
-        size_t height = (max_bin_count <= MAX_ASTERISK) ? bins[i] : static_cast<size_t>(MAX_ASTERISK * (static_cast<double>(bins[i]) / max_bin_count));
-        for (size_t j = 0; j < height; j++) {
-            cout << "*";
-        }
-        cout << endl;
-    }
-
     return 0;
 }

unittest.cpp

@@ -0,0 +1,12 @@
+#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;
+    find_minmax({1, 2}, min, max);
+    CHECK(min == 1);
+    CHECK(max == 2);
+}