code: оформление гистограммы svg

histogram.cpp

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

histogram_internal.h

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

lab01.cbp

@@ -32,7 +32,12 @@
 			<Add option="-Wall" />
 			<Add option="-fexceptions" />
 		</Compiler>
+		<Unit filename="histogram.cpp" />
+		<Unit filename="histogram.h" />
+		<Unit filename="histogram_internal.h" />
 		<Unit filename="main.cpp" />
+		<Unit filename="text.cpp" />
+		<Unit filename="text.h" />
 		<Extensions>
 			<lib_finder disable_auto="1" />
 		</Extensions>

main.cpp

@@ -1,5 +1,8 @@
 #include <iostream>
 #include <vector>
+#include "histogram.h"
+#include "text.h"
+#include "svg.h"
 
 using namespace std;
 
@@ -26,96 +29,9 @@ 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 > max )
-        {
-            max = x;
-        }
-        if (x < min)
-        {
-            min = x;
-        }
-    }
-}
-
-vector<size_t>
-make_histogram(const vector<double>& numbers, size_t& bin_count)
-{
-    double min = 0;
-    double max = 0;
-    find_minmax(numbers, min, max);
-    auto bin_size = (max - min)/bin_count;
-    vector<size_t> bins(bin_count);
-    for (double number : numbers)
-    {
-        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 <= number) && (number < 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) {
-    const size_t SCREEN_WIDTH = 80;
-    const size_t MAX_ASTERISK = SCREEN_WIDTH - 3 - 1;
-    size_t max_count = 0;
-    for (size_t s = 0; s < bin_count; s++)
-    {
-        if (bins[s] > max_count)
-        {
-            max_count = bins[s];
-        }
-    }
-    for (size_t bin : bins)
-    {
-        if (bin <100)
-        {
-            cout << " ";
-        }
-        if (bin <10)
-        {
-            cout << " ";
-        }
-        cout << bin << "|";
-        if (max_count > MAX_ASTERISK)
-        {
-            size_t count = bin;
-            size_t height = MAX_ASTERISK * (static_cast<double>(count) / max_count);
-            for (size_t t = 0; t < height; t++)
-            {
-                cout << "*";
-            }
-        }
-        else for (size_t k = 0; k < bin; k++)
-            {
-                cout << "*";
-            }
-        cout << endl;
-    }
-}
-
 int main()
 {
     Input in = input_data();
     vector<size_t> bins = make_histogram(in.numbers, in.bin_count);
-    show_histogram_text(bins, in.bin_count);
+    show_histogram_svg(bins);
 }

svg.cpp

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

svg.h

@@ -0,0 +1,9 @@
+#ifndef SVG_H_INCLUDED
+#define SVG_H_INCLUDED
+
+#include <vector>
+
+void
+show_histogram_svg(const std::vector<size_t>& bins);
+
+#endif // SVG_H_INCLUDED

text.cpp

@@ -0,0 +1,42 @@
+#include <iostream>
+#include "text.h"
+#include "histogram.h"
+
+using namespace std;
+
+void
+show_histogram_text(const vector<size_t>& bins, size_t& bin_count) {
+    const size_t SCREEN_WIDTH = 80;
+    const size_t MAX_ASTERISK = SCREEN_WIDTH - 3 - 1;
+    size_t max_count = 0;
+    for (size_t s = 0; s < bin_count; s++)
+    {
+        if (bins[s] > max_count)
+        {
+            max_count = bins[s];
+        }
+    }
+    auto kof = static_cast<double>(MAX_ASTERISK) / max_count;
+    if (kof > 1)
+    {
+        kof = 1;
+    }
+    for (size_t bin : bins)
+    {
+        if (bin <100)
+        {
+            cout << " ";
+        }
+        if (bin <10)
+        {
+            cout << " ";
+        }
+        cout << bin << "|";
+        size_t weight = bin * kof;
+        for (size_t t = 0; t < weight; t++)
+        {
+            cout << "*";
+        }
+        cout << endl;
+    }
+}

text.h

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

unittest.cbp

@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
+<CodeBlocks_project_file>
+	<FileVersion major="1" minor="6" />
+	<Project>
+		<Option title="unittest" />
+		<Option pch_mode="2" />
+		<Option compiler="gcc" />
+		<Build>
+			<Target title="Debug">
+				<Option output="bin/Debug/unittest" prefix_auto="1" extension_auto="1" />
+				<Option object_output="obj/Debug/" />
+				<Option type="1" />
+				<Option compiler="gcc" />
+				<Compiler>
+					<Add option="-g" />
+				</Compiler>
+			</Target>
+			<Target title="Release">
+				<Option output="bin/Release/unittest" prefix_auto="1" extension_auto="1" />
+				<Option object_output="obj/Release/" />
+				<Option type="1" />
+				<Option compiler="gcc" />
+				<Compiler>
+					<Add option="-O2" />
+				</Compiler>
+				<Linker>
+					<Add option="-s" />
+				</Linker>
+			</Target>
+		</Build>
+		<Compiler>
+			<Add option="-Wall" />
+		</Compiler>
+		<Unit filename="histogram.cpp" />
+		<Unit filename="histogram_internal.h" />
+		<Unit filename="unittest.cpp" />
+		<Extensions>
+			<lib_finder disable_auto="1" />
+		</Extensions>
+	</Project>
+</CodeBlocks_project_file>

unittest.cpp

@@ -0,0 +1,39 @@
+#define DOCTEST_CONFIG_NO_MULTITHREADING
+#define DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN
+#include <vector>
+#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("negative numbers") {
+    double min = 0;
+    double max = 0;
+    find_minmax({ -10, 10 }, min, max);
+    CHECK(min == -10);
+    CHECK(max == 10);
+}
+
+TEST_CASE("empty numbers") {
+    double min = 0;
+    double max = 0;
+    find_minmax({ }, min, max);
+    CHECK(min != 0);
+    CHECK(max != 0);
+}
+
+TEST_CASE("one number") {
+    double min = 0;
+    double max = 0;
+    find_minmax({ 2 }, min, max);
+    CHECK(min == 2);
+    CHECK(max == 2);
+}
+
+