code: добавление параметров in и promt в функцию

main.cpp

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

svg.cpp

@@ -1,4 +1,5 @@
 #include "svg.h"
+#include "histogram_internal.h"
 #include <iostream>
 #include <string>
 
@@ -31,25 +32,18 @@ void show_histogram_svg(const vector<size_t>& bins) {
     const auto TEXT_BASELINE = 20;
     const auto TEXT_WIDTH = 50;
     const auto BIN_HEIGHT = 30;
-
-    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);
+    const auto BLOCK_WIDTH = 10;
 
     svg_begin(IMAGE_WIDTH, IMAGE_HEIGHT);
 
     double top = 0;
     for (size_t bin : bins) {
-        double bin_width = BLOCK_WIDTH * bin;
+        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, "black", "#aaaaaa");
+        svg_rect(TEXT_WIDTH, top, bin_width, BIN_HEIGHT);
         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 = "black");
+void svg_rect(double x, double y, double width, double height, const std::string& stroke = "black", const std::string& fill = "red");
 void show_histogram_svg(const std::vector<size_t>& bins);
 #endif // SVG_H_INCLUDED