code: изображение

svg.cpp

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