финальное масштабирование

svg.cpp

@@ -1,6 +1,7 @@
 #include <iostream>
 #include <vector>
 #include <string>
+#include <algorithm>
 #include "svg.h"
 
 using namespace std;
@@ -18,44 +19,53 @@ void svg_end() {
     cout << "</svg>\n";
 }
 
-void svg_text(double left, double baseline, string text) {
+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, string stroke = "black", string fill = "black") {
+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) {
-    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;
+    const auto BIN_GAP = 5;
+    const auto MAX_WIDTH = IMAGE_WIDTH - TEXT_WIDTH - 10;
+
+    if (bins.empty()) {
+        svg_begin(IMAGE_WIDTH, IMAGE_HEIGHT);
+        svg_text(TEXT_LEFT, TEXT_BASELINE, "No data");
+        svg_end();
+        return;
+    }
+
+    // Íàõîäèì ìàêñèìàëüíîå çíà÷åíèå
+    size_t max_count = *max_element(bins.begin(), bins.end());
+
+    double scaling_factor = (max_count == 0) ? 1.0 : (MAX_WIDTH / static_cast<double>(max_count));
 
     svg_begin(IMAGE_WIDTH, IMAGE_HEIGHT);
 
     double top = 0;
-    size_t max_count = bins[0];
     for (size_t bin : bins) {
-        if (max_count < bin) {
+        const double bin_width = bin * scaling_factor;
-            max_count = bin;
+
-        }
+        svg_text(TEXT_LEFT, top + TEXT_BASELINE, to_string(bin));
+
+        if (bin == 0) {
+            svg_rect(TEXT_WIDTH, top, 1, BIN_HEIGHT, "black", "#cccccc");
+        } else {
+            svg_rect(TEXT_WIDTH, top, bin_width, BIN_HEIGHT, "black", "#4169e1");
         }
 
-    for (size_t bin : bins) {
+        top += BIN_HEIGHT + BIN_GAP;
-        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

@@ -2,8 +2,13 @@
 #define SVG_H_INCLUDED
 
 #include <vector>
-#include <cstddef> // Äëÿ size_t
+#include <cstddef>
 
+void svg_begin(double width, double height);
+void svg_end();
+void svg_text(double left, double baseline, const std::string& text);
+void svg_rect(double x, double y, double width, double height,
+              const std::string& stroke = "black", const std::string& fill = "black");
 void show_histogram_svg(const std::vector<size_t>& bins);
 
 #endif // SVG_H_INCLUDED