main.cpp

@@ -9,34 +9,26 @@ struct Input {
     size_t bin_count{};
 };
 
-Input input_data(istream& in, bool promt = false) {
+Input input_data() {
-
-    //ïåðåìåííàÿ-ýêçåìïëÿð
-    Input qin;
-
     //ââîä êîëè÷åñòâà ÷èñåë
     size_t number_count;
-    if( promt ) {
+    cerr << "Enter number count: ";
-        cerr << "Enter number count: ";
+    cin >> number_count;
-    }
+    //ïåðåìåííàÿ-ýêçåìïëÿð
-    in >> number_count;
+    Input in;
-
     //ââîä ÷èñåë
-    qin.numbers.resize(number_count);
+    in.numbers.resize(number_count);
     for (size_t i = 0 ; i < number_count ; i++) {
-        in >> qin.numbers[i];
+        cin >> in.numbers[i];
     }
-
     //ââîä êîëè÷åñòâà êîðçèí
-    if( promt ) {
+    cerr << "Enter bin count: ";
-        cerr << "Enter bin count: ";
+    cin >> in.bin_count;
-    }
+    return in;
-    in >> qin.bin_count;
-    return qin;
 }
 
 int main() {
-    auto in = input_data(cin);
+    auto in = input_data();
     auto bins = make_histogram(in.numbers, in.bin_count);
     show_histogram_svg(bins);
 }

svg.cpp

@@ -1,5 +1,4 @@
 #include "svg.h"
-#include "histogram_internal.h"
 #include <iostream>
 #include <string>
 
@@ -32,18 +31,25 @@ void show_histogram_svg(const vector<size_t>& bins) {
     const auto TEXT_BASELINE = 20;
     const auto TEXT_WIDTH = 50;
     const auto BIN_HEIGHT = 30;
-    const auto BLOCK_WIDTH = 10;
+
+    size_t max_count = 0;
+    for (size_t count : bins) {
+        if (count > max_count) {
+            max_count = count;
+        }
+    }
+
+    double BLOCK_WIDTH = (IMAGE_WIDTH - TEXT_WIDTH) / static_cast<double>(max_count);
 
     svg_begin(IMAGE_WIDTH, IMAGE_HEIGHT);
 
     double top = 0;
     for (size_t bin : bins) {
-        const double bin_width = BLOCK_WIDTH * bin;
+        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);
+        svg_rect(TEXT_WIDTH, top, bin_width, BIN_HEIGHT, "black", "#aaaaaa");
         top += BIN_HEIGHT;
     }
+
     svg_end();
 }
-
-

svg.h

@@ -8,6 +8,6 @@
 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 = "red");
+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