code: добавлен svg

histogram.cpp

@@ -0,0 +1,42 @@
+#include "histogram.h"
+
+bool find_minmax(vector<double> vec, double& min, double& max) {
+    if (vec.size() == 0) {
+        cerr << "Empty vec";
+        return false;
+    }
+    min = vec[0];
+    max = vec[0];
+    for (double x : vec) {
+        if (x < min) {
+            min = x;
+        }
+        else if (x > max)
+        {
+            max = x;
+        }
+    }
+    return true;
+}
+vector<size_t> make_histogram(size_t number, vector<double> vec) {
+    vector<size_t> bins(number);
+    double mn, mx;
+    find_minmax(vec, mn, mx);
+    float bin_size = (mx - mn) / number;
+    for (size_t i = 0; i < vec.size(); i++) {
+        bool fl = false;
+        for (size_t j = 0; (j < number - 1) && !fl; j++) {
+            auto lo = mn + j * bin_size;
+            auto hi = mn + (j + 1) * bin_size;
+            if ((lo <= vec[i]) && (vec[i] < hi)) {
+                bins[j]++;
+                fl = true;
+            }
+        }
+        if (!fl) {
+            bins[number - 1]++;
+
+        }
+    }
+    return bins;
+}

histogram.h

@@ -0,0 +1,5 @@
+#include <vector>
+#include <iostream>
+
+using namespace std;
+vector<size_t> make_histogram(size_t number, vector<double> vec);

histogram_internal.h

@@ -0,0 +1 @@
+bool find_minmax(std::vector<double> vec, double& min, double& max);

main.cpp

@@ -1,128 +1,28 @@
-#include <iostream>
-#include <vector>
-
-using namespace std;
-
-int main() {
-
-    size_t number_count, bin_count;
-    double min, max, bin_size;
-
+#include "histogram.h"
+#include "text.h"
+#include "svg.h"
+
+struct Input {
+    vector<double> vec;
+    size_t korz{};
+};
+Input input_data() {
+    Input in;
+    size_t n, korz;
 
     cerr << "Enter the number of elements: ";
-    cin >> number_count;
-
-    vector<double> numbers(number_count);
-
-    cerr << "\nEnter " << number_count << " elements:" << endl;
-    for (size_t i = 0; i < number_count; i++) {
-        cin >> numbers[i];
-    }
-
-
-    cerr << "Enter the number of bins: ";
-    cin >> bin_count;
-
-    min = numbers[0];
-    max = numbers[0];
-    for (double x : numbers) {
-        if (x < min) {
-            min = x;
-        } else {
-            if (x > max) {
-                max = x;
-            }
-        }
-    }
-
-    bin_size = (max - min) / bin_count;
-
-    vector<size_t> bins(bin_count, 0);
-
-    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 ((numbers[i] >= lo) && (numbers[i] <= hi)) {
-                bins[j]++;
-                found = true;
-            }
-        }
-        if (!found) {
-            bins[bin_count - 1]++;
-        }
-    }
-
-    size_t max_count = bins[0];
-    for (size_t i = 1; i < bin_count; i++) {
-        if (bins[i] > max_count) {
-            max_count = bins[i];
-        }
-    }
-
-    const size_t SCREEN_WIDTH = 80;
-    const size_t MAX_ASTERISK = SCREEN_WIDTH - 3 - 1;
-
-
-    short space_count;
-
-    cerr << "\nHistogram:" << endl;
-
-    if (max_count <= MAX_ASTERISK) {
-        for (size_t i = 0; i < bin_count; i++) {
-            if (bins[i] < 10) {
-                space_count = 2;
-            } else if (bins[i] >= 10 && bins[i] < 100) {
-                space_count = 1;
-            } else if (bins[i] >= 100 && bins[i] < 1000) {
-                space_count = 0;
-            }
-
-
-
-            for (size_t k = 0; k < space_count; k++) {
-                cout << " ";
-            }
-
-            cout << bins[i];
-
-            cout << "|";
-
-
-            for (size_t j = 0; j < bins[i]; j++) {
-                cout << "*";
-            }
-
-            cout << "\n";
-        }
-    } else {
-        for (size_t i = 0; i < bin_count; i++) {
-            if (bins[i] < 10) {
-                space_count = 2;
-            } else if (bins[i] >= 10 && bins[i] < 100) {
-                space_count = 1;
-            } else if (bins[i] >= 100 && bins[i] < 1000) {
-                space_count = 0;
+    cin >> n;
+    in.vec.resize(n);
+    cerr << "Enter elements: ";
+    for (size_t i = 0; i < n; i++)
+        cin >> in.vec[i];
+    cerr << "Enter bin count: ";
+    cin >> in.korz;
+    return in;
 }
 
-
-            for (size_t k = 0; k < space_count; k++) {
-                cout << " ";
-            }
-
-            cout << bins[i];
-
-            cout << "|";
-
-            size_t height = static_cast<size_t>(MAX_ASTERISK * (static_cast<double>(bins[i]) / max_count));
-            for (size_t j = 0; j < height; j++) {
-                cout << "*";
-            }
-
-            cout << "\n";
-        }
-    }
-
-    return 0;
+int main() {
+    auto in = input_data();
+    auto bins = make_histogram(in.korz, in.vec);
+    show_histogram_svg(bins);
 }

svg.cpp

@@ -0,0 +1,73 @@
+#include "svg.h"
+
+using namespace std;
+
+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
+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;
+    const auto BLACK = "black";
+    const auto PURPLE = "purple";
+    const auto MAX_WIDTH = IMAGE_WIDTH - TEXT_WIDTH;
+
+
+    svg_begin(IMAGE_WIDTH,IMAGE_HEIGHT);
+
+    double top = 0;
+    double max_count = bins[0];
+    for (size_t i = 0; i < bins.size(); i++)
+    {
+        if (max_count < bins[i])
+        {
+            max_count = bins[i];
+        }
+    }
+
+    for (size_t bin : bins)
+    {
+        double bin_width = (MAX_WIDTH) * (bin/max_count);
+        svg_text(TEXT_LEFT, top + TEXT_BASELINE, to_string(bin));
+        svg_rect(TEXT_WIDTH, top, bin_width, BIN_HEIGHT, BLACK, PURPLE);
+        top += BIN_HEIGHT;
+    }
+
+    svg_end();
+}

svg.h

@@ -0,0 +1,7 @@
+#include <iostream>
+#include <vector>
+#include <string>
+#include <math.h>
+
+using namespace std;
+void show_histogram_svg(const vector<size_t>& bins);

text.cpp

@@ -0,0 +1,82 @@
+#include "text.h"
+
+void show_histogram(std::vector<size_t> bins) {
+    bool gigant = false;
+    auto spaces = 0;
+    size_t mx_count = 0;
+    for (auto x : bins) {
+        if (x > 76) {
+            gigant = true;
+        }
+        if (x > mx_count) {
+            mx_count = x;
+        }
+        auto len = 0;
+        while (x > 0) {
+            x /= 10;
+            len++;
+        }
+        if (len > spaces) {
+            spaces = len;
+        }
+    }
+    if (spaces == 1) {
+        for (size_t i = 0; i < bins.size(); i++) {
+            std::cout << "  " << bins[i] << "|";
+            if (gigant) {
+                if (bins[i] == mx_count) {
+                    for (size_t j = 0; j < 76; j++) {
+                        std::cout << "*";
+                    }
+                }
+                else
+                {
+                    for (size_t j = 0; j < 76 * static_cast<double>(bins[i]) / mx_count; j++) {
+                        std::cout << "*";
+                    }
+                }
+            }
+            else
+            {
+                for (size_t j = 0; j < bins[i]; j++) {
+                    std::cout << "*";
+                }
+                std::cout << std::endl;
+            }
+        }
+    }
+    else
+    {
+        for (size_t i = 0; i < bins.size(); i++) {
+            int len = 1;
+            int k = bins[i];
+            for (; k /= 10; ++len);
+            while (len < spaces) {
+                std::cout << " ";
+                len++;
+            }
+            std::cout << bins[i];
+            std::cout << "|";
+            if (gigant) {
+                if (bins[i] == mx_count) {
+                    for (size_t j = 0; j < 76; j++) {
+                        std::cout << "*";
+                    }
+                }
+                else
+                {
+                    for (size_t j = 0; j < (76 * static_cast<double>(bins[i]) / mx_count - 1); j++) {
+                        std::cout << "*";
+                    }
+                }
+            }
+            else
+            {
+                for (size_t j = 0; j < bins[i]; j++) {
+                    std::cout << "*";
+                }
+            }
+            std::cout << std::endl;
+        }
+    }
+}

text.h

@@ -0,0 +1,4 @@
+#include <iostream>
+#include <vector>
+
+void show_histogram(std::vector<size_t> bins);

unittest.cbp

@@ -0,0 +1,38 @@
+<?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>
+		<Extensions>
+			<lib_finder disable_auto="1" />
+		</Extensions>
+	</Project>
+</CodeBlocks_project_file>

unittest.cpp

@@ -0,0 +1,49 @@
+#define DOCTEST_CONFIG_NO_MULTITHREADING
+#define DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN
+#include "doctest.h"
+#include "histogram_internal.h"
+
+using namespace std;
+
+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("empty vector"){
+    double min = 0;
+    double max = 0;
+    vector<double> empty;
+    bool result = find_minmax(empty, min, max);
+    CHECK(!result);
+}
+
+TEST_CASE("single vector"){
+    double min = 0;
+    double max = 0;
+    vector<double> single = {3};
+    find_minmax(single, min, max);
+    CHECK(min == 3);
+    CHECK(max == 3);
+}
+
+TEST_CASE("negative vector"){
+    double min = 0;
+    double max = 0;
+    vector<double> negative = {-1, -2};
+    find_minmax(negative, min, max);
+    CHECK(min == -2);
+    CHECK(max == -1);
+}
+
+TEST_CASE("same vector"){
+    double min = 0;
+    double max = 0;
+    vector<double> identical = {1, 1};
+    find_minmax(identical, min, max);
+    CHECK(min == 1);
+    CHECK(max == 1);
+}

unittest.depend

@@ -0,0 +1,8 @@
+# depslib dependency file v1.0
+1746274971 source:c:\users\natasha\desktop\Ïðîãè Ñ2\cs-lab34\histogram.cpp
+	"histogram.h"
+
+1746274971 c:\users\natasha\desktop\Ïðîãè Ñ2\cs-lab34\histogram.h
+	<vector>
+	<iostream>
+