svg: гистограммы до конца

histogram.cpp

@@ -17,8 +17,8 @@ find_minmax(const vector<double>& numbers, double& min, double& max) {
     }
 }
 
-std::vector<double>
-make_histogram(const std::vector<double>& numbers, size_t bin_count){
+vector<double>
+make_histogram(const vector<double>& numbers, size_t bin_count){
     vector<double> bins (bin_count);
 
     double min = 0, max = 0;

svg.cpp

@@ -1,5 +1,6 @@
 #include <iostream>
 #include <vector>
+#include <string>
 using namespace std;
 
 void
@@ -17,9 +18,40 @@ 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, string fill){
+    cout << "<rect x='" << x << "' y='" << y << "' width='" << width << "' height='" << height << "' stroke='" << stroke << "' fill='" << fill << "' />";
+}
+
+
+
 void
 show_histogram_svg(const vector<double>& 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;
+    string stroke = "black";
+    string fill = "black";
+
     svg_begin(400, 300);
+    double top = 0;
+    for (double bin : bins) {
+        const double bin_width = BLOCK_WIDTH * bin;
+        svg_text(TEXT_LEFT, top + TEXT_BASELINE, to_string(bin));
+        svg_rect(TEXT_WIDTH, top, bin_width, BIN_HEIGHT, stroke, fill);
+        top += BIN_HEIGHT;
+    }
     svg_end();
 }
 
+
+