code: разделение кода на файлы

histogram.cpp

@@ -0,0 +1,34 @@
+static 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;
+    }
+}
+
+std::vector <size_t>
+make_histogram(const std::vector<double>& numbers, size_t bucket, size_t number_count) {
+    std::vector <size_t> stolb(bucket);
+    double min, max;
+    find_minmax (numbers, min, max);
+    float k = (max-min)/bucket;
+    for (size_t i = 0; i < bucket; i++) stolb[i] = 0;
+    for (size_t i = 0; i < number_count; i++)
+    {
+        bool flag = false;
+        for (size_t j = 0; (j < bucket && !flag); j++)
+        {
+            if (numbers[i] >= (min+k*j) && numbers[i] < (min+k*(1+j)))
+            {
+                stolb[j]++;
+                flag = true;
+
+            }
+        }
+        if (!flag) stolb[bucket-1]++;
+    }
+    return stolb;
+}

histogram.h

@@ -0,0 +1,10 @@
+#ifndef HISTOGRAM_H_INCLUDED
+#define HISTOGRAM_H_INCLUDED
+
+#include <vector>
+#include "histogram.cpp"
+
+std::vector<size_t>
+make_histogram(const std::vector<double>& numbers, size_t buckets, size_t number_count);
+
+#endif // HISTOGRAM_H_INCLUDED

main.cpp

@@ -1,74 +1,35 @@
 #include <iostream>
 #include <vector>
-
+#include "histogram.h"
+#include "text.h"
+#include "svghis.h"
 
 using namespace std;
 
+struct Input {
+    vector<double> numbers;
+    size_t bucket{};
+    size_t number_count{};
+};
+
+Input
+input_data() {
+    Input in;
+    cin >> in.number_count;
+    cin >> in.bucket;
+    in.numbers.resize(in.number_count);
+    for (size_t i = 0; i < in.number_count; i++) {
+        cin >> in.numbers[i];
+    }
+    return in;
+}
+
 int main()
 {
-    const size_t SCREEN_WIDTH = 80;
+    auto in = input_data();
-    const size_t MAX_ASTERISK = SCREEN_WIDTH - 3 - 1;
+    auto stolb = make_histogram(in.numbers, in.bucket, in.number_count);
-
+    show_histogram_text(stolb, in.bucket);
-
+    show_histogram_svg(stolb);
-    int number_count, bucket;
-
-    cerr << "Enter number count: "; cin >> number_count;
-    cerr << "Enter bucket: "; cin >> bucket;
-
-    vector <double> numbers(number_count);
-    for (int i = 0; i < number_count; i++) cin >> numbers[i];
-
-    float min = numbers[0];
-    float max = numbers[0];
-
-    for (float x : numbers)
-    {
-        if (x < min) min = x;
-        else if (x > max) max = x;
-    }
-
-    float k = (max-min)/bucket;
-
-    vector <int> stolb(bucket);
-
-    for (int j = 0; j < bucket; j++) stolb[j] = 0;
-
-    for (int i = 0; i < number_count; i++)
-    {
-        bool flag = false;
-        for (int j = 0; (j < bucket && !flag); j++)
-        {
-            if (numbers[i] >= (min+k*j) && numbers[i] < (min+k*(1+j)))
-            {
-                stolb[j]++;
-                flag = true;
-
-            }
-        }
-        if (!flag) stolb[bucket-1]++;
-    }
-
-    int maxlen = 0;
-
-    for (int j = 0; j < bucket; j++)
-    {
-        if (maxlen<stolb[j]) maxlen = stolb[j];
-    }
-
-    for (int j = 0; j < bucket; j++)
-    {
-        if (stolb[j] < 100) cout << " ";
-        if (stolb[j] < 10) cout << " ";
-        cout << stolb[j] << "|";
-        size_t height = stolb[j];
-        if (maxlen > MAX_ASTERISK)
-        {
-            if (maxlen != stolb[j]) height = MAX_ASTERISK * (static_cast <float> (stolb[j])/maxlen);
-            else if (maxlen == stolb[j]) height = MAX_ASTERISK;
-        }
-        for (int i = 0; i < height; i++) cout << "*";
-        cout << "\n";
-    }
 
     return 0;
 }

svghis.cpp

@@ -0,0 +1,70 @@
+#include <vector>
+
+void
+svg_begin(double width, double height) {
+    std::cout << "<?xml version='1.0' encoding='UTF-8'?>\n";
+    std::cout << "<svg ";
+    std::cout << "width='" << width << "' ";
+    std::cout << "height='" << height << "' ";
+    std::cout << "viewBox='0 0 " << width << " " << height << "' ";
+    std::cout << "xmlns='http://www.w3.org/2000/svg'>\n";
+}
+
+void
+svg_end() {
+    std::cout << "</svg>\n";
+}
+
+void
+svg_text(double left, double baseline, std::string text) {
+    std::cout << "<text x='" << left
+         << "' y='" << baseline
+         << "'>" << text << "</text>";
+}
+
+void svg_rect(double x, double y, double width, double height,
+              std::string stroke = "red", std::string fill = "#79553D") {
+    std::cout << "<rect x='" << x
+         << "' y='" << y
+         << "' width='" << width
+         << "' height='" << height
+         << "' stroke='" << stroke
+         << "' fill='" << fill
+         << "' />";
+}
+
+void
+show_histogram_svg(const std::vector<size_t>& stolb) {
+    const auto IMAGE_WIDTH = 400;
+    const auto IMAGE_HEIGHT = 300;
+    const auto TEXT_LEFT = 20;
+    const auto TEXT_BASELINE = 20;
+    const auto TEXT_WIDTH = 50;
+    const auto BIN_HEIGHT = 30;
+    const auto BLOCK_WIDTH = 10;
+
+    const size_t MAX_ASTERISK = IMAGE_WIDTH - TEXT_WIDTH;
+
+    svg_begin(400, 300);
+
+    size_t maxlen = 0;
+    for (size_t len : stolb)
+    {
+        if (maxlen<len) maxlen = len;
+    }
+
+    double top = 0;
+    for (size_t bin : stolb) {
+        size_t wight = bin;
+        if ((maxlen*10) > MAX_ASTERISK){
+            if (maxlen != bin) wight = MAX_ASTERISK * (static_cast <double> (bin/maxlen));
+            else if (maxlen == bin) wight = MAX_ASTERISK;
+        }
+        const double bin_width = BLOCK_WIDTH * wight;
+        svg_text(TEXT_LEFT, top + TEXT_BASELINE, std::to_string(bin));
+        svg_rect(TEXT_WIDTH, top, bin_width, BIN_HEIGHT);
+        top += BIN_HEIGHT;
+    }
+
+    svg_end();
+}

svghis.h

@@ -0,0 +1,10 @@
+#ifndef SVGHIS_H_INCLUDED
+#define SVGHIS_H_INCLUDED
+
+#include <vector>
+#include "svghis.cpp"
+
+void
+show_histogram_svg(const std::vector<size_t>& stolb);
+
+#endif // SVGHIS_H_INCLUDED

text.cpp

@@ -0,0 +1,26 @@
+void
+show_histogram_text(std::vector <size_t> stolb, size_t bucket) {
+    const size_t SCREEN_WIDTH = 80;
+    const size_t MAX_ASTERISK = SCREEN_WIDTH - 3 - 1;
+    int maxlen = 0;
+
+    for (int j = 0; j < bucket; j++)
+    {
+        if (maxlen<stolb[j]) maxlen = stolb[j];
+    }
+
+    for (int j = 0; j < bucket; j++)
+    {
+        if (stolb[j] < 100) std::cout << " ";
+        if (stolb[j] < 10) std::cout << " ";
+        std::cout << stolb[j] << "|";
+        size_t height = stolb[j];
+        if (maxlen > MAX_ASTERISK)
+        {
+            if (maxlen != stolb[j]) height = MAX_ASTERISK * (static_cast <float> (stolb[j])/maxlen);
+            else if (maxlen == stolb[j]) height = MAX_ASTERISK;
+        }
+        for (int i = 0; i < height; i++) std::cout << "*";
+        std::cout << "\n";
+    }
+}

text.h

@@ -0,0 +1,10 @@
+#ifndef TEXT_H_INCLUDED
+#define TEXT_H_INCLUDED
+
+#include <vector>
+#include "text.cpp"
+
+void
+show_histogram_text(std::vector <size_t> stolb, size_t bucket);
+
+#endif // TEXT_H_INCLUDED

unittest.cpp

@@ -0,0 +1,36 @@
+#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);
+}
+
+TEST_CASE("distinct negative numbers") {
+    double min = 0;
+    double max = 0;
+    find_minmax({-1, -2}, min, max);
+    CHECK(min == -2);
+    CHECK(max == -1);
+}
+
+TEST_CASE("one element") {
+    double min = 0;
+    double max = 0;
+    find_minmax({1}, min, max);
+    CHECK(min == 1);
+    CHECK(max == 1);
+}
+
+TEST_CASE("same numbers") {
+    double min = 0;
+    double max = 0;
+    find_minmax({1, 1}, min, max);
+    CHECK(min == 1);
+    CHECK(max == 1);
+}