последний коммит

LR3/LR3.cbp

@@ -37,7 +37,10 @@
 		<Unit filename="histogram.h">
 			<Option target="&lt;{~None~}&gt;" />
 		</Unit>
+		<Unit filename="histogram_internal.h" />
 		<Unit filename="main.cpp" />
+		<Unit filename="svg.cpp" />
+		<Unit filename="svg.h" />
 		<Unit filename="text.cpp" />
 		<Unit filename="text.h">
 			<Option target="&lt;{~None~}&gt;" />

LR3/histogram.cpp

@@ -1,4 +1,5 @@
 #include "histogram.h"
+#include "histogram_internal.h"
 #include <vector>
 
 

LR3/histogram_internal.h

@@ -0,0 +1,9 @@
+#pragma once
+
+#include <vector>
+
+
+using namespace std;
+
+void
+find_minmax(vector<double> numbers, double& min, double& max);

LR3/main.cpp

@@ -2,6 +2,7 @@
 #include <vector>
 #include "histogram.h"
 #include "text.h"
+#include "svg.h"
 
 using namespace std;
 
@@ -30,5 +31,5 @@ int main()
 {
     auto in = input_data();
     auto bins = make_histogram(in.numbers, in.bin_count);
-    show_histogram_text(bins);
+    show_histogram_svg(bins);
 }

LR3/svg.cpp

@@ -0,0 +1,54 @@
+#include "svg.h"
+#include <string>
+using namespace std;
+
+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 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 = "black")
+{
+    cout << "<rect x='" << x << "' y='" << y << "' width='" << width
+              << "' height='" << height << "' stroke='" << stroke << "' fill='" << fill << " '/>";
+}
+
+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;
+    const auto BLOCK_WIDTH = 10;
+
+    svg_begin(400, 300);
+    double top = 0;
+
+    for (size_t bin : bins) {
+        const double bin_width = BLOCK_WIDTH * bin;
+        if(bin_width> IMAGE_WIDTH) {
+            const double bin_width= IMAGE_WIDTH - TEXT_WIDTH;
+        }
+        svg_text(TEXT_LEFT, top + TEXT_BASELINE, to_string(bin));
+        svg_rect(TEXT_WIDTH, top, bin_width, BIN_HEIGHT, "blue", "green");
+        top += BIN_HEIGHT;
+    }
+
+    //svg_text(20, 20, to_string(bins[0]));
+    //svg_rect(50, 0, bins[0] * 10, 30);
+    svg_end();
+}
+

LR3/svg.h

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

LR3/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>

LR3/unittest.cpp

@@ -0,0 +1,29 @@
+#define DOCTEST_CONFIG_NO_MULTITHREADING
+#define DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN
+#include "doctest.h"
+#include "histogram_internal.h"
+#include <vector>
+
+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("ìàññèâ èç îäíîãî ÷èñëà") {
+    double min = 0;
+    double max = 0;
+    find_minmax({1}, min, max);
+    CHECK(min == 1);
+    CHECK(max == 1);
+}
+
+TEST_CASE("îòðèöàòåëüíûå ÷èñëà") {
+    double min = 0;
+    double max = 0;
+    find_minmax({-1, -2}, min, max);
+    CHECK(min == -2);
+    CHECK(max == -1);
+}

LR3/unittest.depend

@@ -0,0 +1,12 @@
+# depslib dependency file v1.0
+1748202161 source:c:\users\daemo\onedrive\Ðàáî÷èé ñòîë\lab03\lr3\histogram.cpp
+	"histogram.h"
+	"histogram_internal.h"
+	<vector>
+
+1748199863 c:\users\daemo\onedrive\Ðàáî÷èé ñòîë\lab03\lr3\histogram.h
+	<vector>
+
+1748202619 c:\users\daemo\onedrive\Ðàáî÷èé ñòîë\lab03\lr3\histogram_internal.h
+	<vector>
+