build: individ solve

svg.cpp

@@ -6,9 +6,9 @@
 #include "svg.h"
 using namespace std;
 
-
 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 << "' ";
@@ -18,39 +18,60 @@ svg_begin(double width, double height) {
 }
 
 void
-svg_end() {
+svg_end()
+{
     cout << "</svg>\n";
 }
 void
-svg_text(double left, double baseline, string text) {
+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 colour = "black", string fill = "black"){
+void
-    cout << "<rect x='"<<x<<"' y='"<<y<<"' width='"<<width<<"' height='"<<height<<"' stroke = '"<<colour <<"' fill = '"<<fill<<"' />";
+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<size_t>& bins) {
     const auto IMAGE_WIDTH = 400;
     const auto IMAGE_HEIGHT = 300;
-    const auto TEXT_LEFT = 20;
+    const auto TEXT_LEFT = 10;
     const auto TEXT_BASELINE = 20;
     const auto TEXT_WIDTH = 50;
     const auto BIN_HEIGHT = 30;
     const auto BLOCK_WIDTH = 10;
+    const auto MAX_WIDTH = IMAGE_WIDTH-TEXT_WIDTH;
+
+
+    svg_begin(IMAGE_WIDTH,IMAGE_HEIGHT);
+
     double top = 0;
-    double max_count = bins[0];
+double max_count = bins[0];
-    for (size_t i = 0; i < bins.size(); i++) {
+    for (size_t i = 0; i < bins.size(); i++)
+        {
         if (bins[i] > max_count)
             max_count = bins[i];
-    }
+        }
-    svg_begin(400, 300);
+    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 = MAX_WIDTH * (bin/max_count);
-        svg_rect(TEXT_WIDTH, top, bin_width, BIN_HEIGHT, "blue", "#FF00FF");
+
+        const double emptiness_width = MAX_WIDTH - bin_width;
+
+        svg_rect(0, top, emptiness_width, BIN_HEIGHT, "white", "#ffffff");
+
+        svg_text(TEXT_LEFT + MAX_WIDTH, top + TEXT_BASELINE, to_string(bin));
+
+        svg_rect(emptiness_width, top, bin_width, BIN_HEIGHT, "red", "#aaffaa");
+
         top += BIN_HEIGHT;
     }
+
     svg_end();
 }