Добавлены функции svg

main.cpp

@@ -1,182 +1,35 @@
 #include <iostream>
 #include <vector>
 #include "histogram.h"
-
+#include "text.h"
+#include "svg.h"
 using namespace std;
+
 struct Input {
     vector<double> numbers;
-    size_t bin_count{};
+    size_t bin_count;
 };
+
 Input input_data() {
     Input in;
     size_t number_count;
     cerr << "Enter number count: ";
     cin >> number_count;
-    in.numbers.resize(number_count);
 
-    vector<double> numbers(number_count);
+    in.numbers.resize(number_count);
+    cerr << "Enter numbers: ";
     for (size_t i = 0; i < number_count; i++) {
         cin >> in.numbers[i];
     }
 
-    size_t bin_count;
+    cerr << "Enter bin count: ";
-    cerr << "Enter bin count";
     cin >> in.bin_count;
     return in;
 }
-void find_minmax(vector<double>& numbers, double& min,double& max){
+
-    min = numbers[0];
+int main() {
-    max = numbers[0];
-    for (double x : numbers)
-    {
-        if (x < min)
-        {
-            min = x;
-        }
-        else if (x > max)
-        {
-            max = x;
-        }
-    }
-}
-vector<double> make_histogram(vector<double>& numbers, size_t bin_count){
-    double min, max;
-    size_t number_count = size(numbers);
-    vector<double> bins(bin_count));
-    find_minmax(numbers, min, max);
-    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]++;
-        }
-    }
-    return bins;
-}
-void show_histogram_text(vector<double>& bins){
-    int maxbin = 0;
-    for(int bin : bins){
-        if(bin > maxbin){
-            maxbin = bin;
-        }
-    }
-    for(int bin : bins)
-    {
-        size_t height = bin;
-        if (maxbin > 76){
-            size_t height = 76 * (static_cast<double>(bin) / maxbin);
-        }
-        if(10<=bin && bin<100){
-            cout << " " << bin << "|";
-        }
-        else if(bin<10){
-            cout << " " << " " << bin << "|";
-        }
-        else if(bin>100){
-            cout << bin << "|";
-        }
-        for(int i = 0; i < height; i++)
-        {
-            cout << "*";
-        }
-        cout << endl;
-    }
-    return 0;
-}
-}
-int main()
-{
     auto in = input_data();
     auto bins = make_histogram(in.numbers, in.bin_count);
-    show_histogram_text(bins, ...);
+    show_histogram_svg(bins);
-
-    double min, max;
-    find_minmax(in.numbers, min, max);
-    const size_t SCREEN_WIDTH = 80;
-    const size_t MAX_ASTERISK = SCREEN_WIDTH - 3 - 1;
-    size_t number_count, bin_count;
-    cerr << "Enter number count: " << endl;
-    cin >> number_count;
-    cerr << "Enter bin count: " << endl;
-    cin >> bin_count;
-    vector<double> numbers(number_count);
-    for(int i = 0; i < number_count; i++)
-    {
-
-        cerr << "Enter element: " << endl;
-        cin >> numbers[i];
-    }
-    vector<size_t> bins(bin_count);
-    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]++;
-        }
-    }
-    int maxbin = 0;
-    for(int bin : bins){
-        if(bin > maxbin){
-            maxbin = bin;
-        }
-    }
-    for(int bin : bins)
-    {
-        size_t height = bin;
-        if (maxbin > 76){
-            size_t height = 76 * (static_cast<double>(bin) / maxbin);
-        }
-        if(10<=bin && bin<100){
-            cout << " " << bin << "|";
-        }
-        else if(bin<10){
-            cout << " " << " " << bin << "|";
-        }
-        else if(bin>100){
-            cout << bin << "|";
-        }
-        for(int i = 0; i < height; i++)
-        {
-            cout << "*";
-        }
-        cout << endl;
-    }
     return 0;
 }

svg.cpp

@@ -0,0 +1,62 @@
+#include <iostream>
+#include <vector>
+#include <string>
+#include "svg.h"
+
+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_end() {
+    cout << "</svg>\n";
+}
+
+void svg_text(double left, double baseline, string text) {
+    cout << "<text x='" << left << "' y='" << baseline << "'>" << text << "</text>\n";
+}
+
+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 << "' />\n";
+}
+
+void show_histogram_svg(const vector<size_t>& bins) {
+    if (bins.empty()) {
+        cerr << "Error: Empty bins vector\n";
+        return;
+    }
+
+    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 MAX_WIDTH = IMAGE_WIDTH - TEXT_WIDTH;
+
+    svg_begin(IMAGE_WIDTH, IMAGE_HEIGHT);
+
+    double top = 0;
+    size_t max_count = bins[0];
+    for (size_t bin : bins) {
+        if (max_count < bin) {
+            max_count = bin;
+        }
+    }
+
+    for (size_t bin : bins) {
+        const double bin_width = MAX_WIDTH * (static_cast<double>(bin) / max_count);
+        svg_text(TEXT_LEFT, top + TEXT_BASELINE, to_string(bin));
+        svg_rect(TEXT_WIDTH, top, bin_width, BIN_HEIGHT, "black", "red");
+        top += BIN_HEIGHT;
+    }
+
+    svg_end();
+}

svg.h

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