реализация SVG вывода

This reverts commit 6d7e4fbd43.

.gitignore

@@ -0,0 +1,6 @@
+bin/
+obj/
+*.cbp
+*.layout
+*.depend
+*.user

histogram.cpp

@@ -0,0 +1,35 @@
+#include "histogram.h"
+#include <vector>
+using namespace std;
+
+ void find_minmax(const vector<double>& numbers, double& min, double& max) {
+    max = numbers[0];
+    min = numbers[1];
+    for (double x : numbers) {
+        if (x < min) min = x;
+        else if (x > max) max = x;
+    }
+}
+
+vector<size_t> make_histogram(vector<double> numbers, size_t bin_count) {
+    double min, 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;
+}

histogram.h

@@ -0,0 +1,9 @@
+#ifndef HISTOGRAM_H_INCLUDED
+#define HISTOGRAM_H_INCLUDED
+
+#include <vector>
+using namespace std;
+
+vector<size_t> make_histogram(vector<double> numbers, size_t bin_count);
+
+#endif

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

lab01.cbp

@@ -36,7 +36,10 @@
 			<Add option="-Wall" />
 			<Add option="-fexceptions" />
 		</Compiler>
+		<Unit filename=".gitignore" />
+		<Unit filename="histogram.cpp" />
 		<Unit filename="main.cpp" />
+		<Unit filename="text.cpp" />
 		<Extensions>
 			<lib_finder disable_auto="1" />
 		</Extensions>

main.cpp

@@ -1,102 +1,34 @@
-#include <vector>
 #include <iostream>
-
+#include <vector>
+#include "histogram.h"
+#include "text.h"
 using namespace std;
 
-int main()
+struct Input {
-{
+    vector<double> numbers;
-    const size_t SCREEN_WIDTH = 80;
+    size_t bin_count;
-    const size_t MAX_ASTERISK = SCREEN_WIDTH - 3 - 1;
+};
+
+Input input_data() {
+    Input in;
     size_t number_count;
     cerr << "Enter number count: ";
     cin >> number_count;
 
-    vector<double> numbers(number_count);
+    in.numbers.resize(number_count);
     cerr << "Enter numbers: ";
-    for (size_t i = 0; i < number_count; i++)
+    for (size_t i = 0; i < number_count; i++) {
-    {
+        cin >> in.numbers[i];
-        cin >> numbers[i];
     }
 
-    size_t bin_count;
     cerr << "Enter bin count: ";
-    cin >> bin_count;
+    cin >> in.bin_count;
-
+    return in;
-    vector<size_t> bins(bin_count, 0);
+}
-
-    double min = numbers[0];
-    double max = numbers[0];
-    for (double x : numbers)
-    {
-        if (x < min)
-        {
-            min = x;
-        }
-        else if (x > max)
-        {
-            max = x;
-        }
-    }
-
-    double bin_size = (max - min) / bin_count;
-
-    for (size_t i = 0; i < number_count; 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]++;
-        }
-    }
-    size_t max_bin_count = 0;
-    for (size_t bin : bins)
-    {
-        if (bin > max_bin_count)
-        {
-            max_bin_count = bin;
-        }
-    }
-
-    if (max_bin_count <= MAX_ASTERISK)
-    {
-        for (size_t i = 0; i < bin_count; i++)
-        {
-            if (bins[i] < 10) cout << " ";
-            cout << " " << bins[i] << "|";
-            for (size_t j = 0; j < bins[i]; j++)
-            {
-                cout << "*";
-            }
-            cout << endl;
-        }
-    }
-    else
-    {
-        for (size_t i = 0; i < bin_count; i++)
-        {
-            size_t height = static_cast<size_t>(MAX_ASTERISK * (static_cast<double>(bins[i]) / max_bin_count));
-            // Âûðàâíèâàíèå ïîäïèñè
-            if (bins[i] < 100) cout << " ";
-            if (bins[i] < 10) cout << " ";
-            cout << bins[i] << "|";
-
-            for (size_t j = 0; j < height; j++)
-            {
-                cout << "*";
-            }
-            cout << endl;
-        }
-    }
 
+int main() {
+    auto in = input_data();
+    auto bins = make_histogram(in.numbers, in.bin_count);
+    show_histogram_text(bins, in.bin_count);
     return 0;
 }

svg.cpp

@@ -0,0 +1,37 @@
+#include "svg.h"
+#include <iostream>
+using namespace std;
+
+void svg_begin(double width, double height) {
+    cout << "<?xml version='1.0' encoding='UTF-8'?>\n";
+    cout << "<svg width='" << width << "' height='" << height << "' "
+         << "viewBox='0 0 " << width << " " << height << "' "
+         << "xmlns='http://www.w3.org/2000/svg'>\n";
+}
+
+void svg_text(double left, double baseline, const string& text) {
+    cout << "<text x='" << left << "' y='" << baseline << "'>" << text << "</text>\n";
+}
+
+void svg_rect(double x, double y, double width, double height, const string& stroke, const string& fill) {
+    cout << "<rect x='" << x << "' y='" << y << "' width='" << width << "' height='" << height
+         << "' stroke='" << stroke << "' fill='" << fill << "' />\n";
+}
+
+void show_histogram_svg(const vector<size_t>& bins) {
+    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;
+
+    svg_begin(IMAGE_WIDTH, IMAGE_HEIGHT);
+    double top = 0;
+    for (size_t bin : bins) {
+        svg_text(TEXT_LEFT, top + TEXT_BASELINE, to_string(bin));
+        svg_rect(TEXT_WIDTH, top, bin * 10, BIN_HEIGHT, "black", "#aaffaa");
+        top += BIN_HEIGHT;
+    }
+    svg_end();
+}

svg.h

@@ -0,0 +1,9 @@
+#pragma once
+#include <vector>
+#include <string>
+
+void svg_begin(double, double);
+void svg_end();
+void svg_text(double, double, const std::string&);
+void svg_rect(double, double, double, double, const std::string& = "black", const std::string& = "black");
+void show_histogram_svg(const std::vector<size_t>&);

text.cpp

@@ -0,0 +1,40 @@
+#include "text.h"
+#include <iostream>
+#include <vector>
+
+using namespace std;
+
+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;
+    double max_bin;
+    size_t height;
+    max_bin = bins[0];
+    height = bins[0];
+    for (size_t i = 0; i < bin_count; i++) {
+        if (bins[i] > max_bin) {
+            max_bin = bins[i];
+        }
+    }
+
+    bool flag = false;
+    if (max_bin > 80) {
+        flag = true;
+    }
+    for (size_t i = 0; i < bin_count; i++) {
+        if (bins[i] < 100) cout << " ";
+        if (bins[i] < 10) cout << " ";
+        cout << bins[i] << "|";
+        if (flag == true) {
+            height = MAX_ASTERISK * (static_cast<double>(bins[i]) / max_bin);
+        }
+        else {
+            height = bins[i];
+        }
+        for (size_t j = 0; j < height; j++) {
+            cout << "*";
+        }
+        cout << endl;
+    }
+
+}

text.h

@@ -0,0 +1,9 @@
+#ifndef TEXT_H_INCLUDED
+#define TEXT_H_INCLUDED
+
+#include <vector>
+using namespace std;
+
+void show_histogram_text(vector<size_t> bins, size_t bin_count);
+
+#endif

unittest.cpp

@@ -0,0 +1,25 @@
+#define DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN
+#include "doctest.h"
+#include "histogram_internal.h"
+
+TEST_CASE("Test find_minmax") {
+    double min, max;
+
+    SUBCASE("Empty vector") {
+        find_minmax({}, min, max);
+        CHECK(min == 0);
+        CHECK(max == 0);
+    }
+
+    SUBCASE("Single element") {
+        find_minmax({5}, min, max);
+        CHECK(min == 5);
+        CHECK(max == 5);
+    }
+
+    SUBCASE("Positive numbers") {
+        find_minmax({1, 2, 3}, min, max);
+        CHECK(min == 1);
+        CHECK(max == 3);
+    }
+}