Заготовка собственного варианта

histogram.cpp

@@ -17,13 +17,13 @@ void find_minmax(const std::vector<double>& numbers, double& min, double& max)
     }
 }
 
-std::vector<double> make_histogram(const std::vector<double> &numbers, std::size_t bin_count)
+std::vector<std::size_t> make_histogram(const std::vector<double> &numbers, std::size_t bin_count)
 {
     double min = numbers[0];
     double max = numbers[0];
     find_minmax(numbers, min, max);
     double bin_size = (max - min) / bin_count;
-    std::vector<double>bins(bin_count);
+    std::vector<std::size_t>bins(bin_count);
 
     for (std::size_t i = 0; i < numbers.size(); i++)
     {

histogram.h

@@ -1,5 +1,5 @@
 #ifndef HISTOGRAM_H_INCLUDED
 #define HISTOGRAM_H_INCLUDED
 #include <vector>
-std::vector<double> make_histogram(const std::vector<double>& numbers, std::size_t bin_count);
+std::vector<std::size_t> make_histogram(const std::vector<double>& numbers, std::size_t bin_count);
 #endif // HISTOGRAM_H_INCLUDED

main.cpp

@@ -2,6 +2,7 @@
 #include <vector>
 #include "histogram.h"
 #include "text.h"
+#include "svg.h"
 
 using namespace std;
 
@@ -32,6 +33,6 @@ int main()
 {
     auto in = input_data();
     auto bins = make_histogram(in.numbers, in.bin_count);
-    show_histogram_text(bins);
+    show_histogram_svg(bins);
     return 0;
 }

svg.cpp

@@ -2,7 +2,13 @@
 #include <vector>
 #include "svg.h"
 
-void svg_begin(double width, double height) {
+void InCol (){
+    std::string color;
+    std::cin >> color;
+}
+
+void svg_begin(double width, double height)
+{
     std::cout << "<?xml version='1.0' encoding='UTF-8'?>\n";
     std::cout << "<svg ";
     std::cout << "width='" << width << "' ";
@@ -11,19 +17,24 @@ void svg_begin(double width, double height) {
     std::cout << "xmlns='http://www.w3.org/2000/svg'>\n";
 }
 
-void svg_end() {
+void svg_end()
+{
     std::cout << "</svg>\n";
 }
 
-void svg_text(double left, double baseline, std::string text) {
+void svg_text(double left, double baseline, std::string text)
-        std::cout << "<text x='" << left << "' y='"<< baseline <<"'>"<< text <<"</text>";
+{
+    std::cout << "<text x='" << left << "' y='"<< baseline <<"'>"<< text <<"</text>";
 }
 
-void svg_rect(double x, double y, double width, double height) {
+void svg_rect(double x, double y, double width, double height, std::string color)
-        std::cout << "<rect x='"<< x <<"' y='"<< y <<"' width='"<< width <<"' height='"<< height <<"' fill='#FF0000' />";
+{
+ std::cout << "<rect x='" << x << "' y='" << y << "' width='" << width << "' height='" << height << " ' stroke='#000000' fill='" << color <<"' ></rect>";
 }
 
-void show_histogram_svg(const std::vector<double>& bins) {
+void show_histogram_svg(const std::vector<std::size_t>& bins)
+{
+
     const auto IMAGE_WIDTH = 400;
     const auto IMAGE_HEIGHT = 300;
     const auto TEXT_LEFT = 20;
@@ -32,14 +43,42 @@ void show_histogram_svg(const std::vector<double>& bins) {
     const auto BIN_HEIGHT = 30;
     const auto BLOCK_WIDTH = 10;
 
-    svg_begin(400, 300);
+    std::string color;
+    InCol();
+
+    const std::size_t MAX_ASTERISK = IMAGE_WIDTH - TEXT_WIDTH;
+    svg_begin(IMAGE_WIDTH, IMAGE_HEIGHT);
     double top = 0;
-    for (size_t bin : bins) {
+
-        const double bin_width = BLOCK_WIDTH * bin;
+    std::size_t maxbin=bins[0];
-        svg_text(TEXT_LEFT, top + TEXT_BASELINE, std::to_string(bin));
+    for (std::size_t i=0; i < bins.size(); i++)
-        svg_rect(TEXT_WIDTH, top, bin_width, BIN_HEIGHT);
+    {
-        top += BIN_HEIGHT;
+        if (maxbin < bins[i])
+        {
+            maxbin=bins[i];
+        }
     }
 
-    svg_end();
+    if (maxbin<=76)
+    {
+        for (std::size_t i=0; i < bins.size(); i++)
+        {
+            double bin_width= MAX_ASTERISK * (static_cast<double>(bins[i]) / maxbin);
+            svg_text(TEXT_LEFT, top + TEXT_BASELINE, std::to_string(bins[i]));
+            svg_rect(TEXT_WIDTH, top, bin_width, BIN_HEIGHT, color);
+            top += BIN_HEIGHT;
+        }
+        svg_end();
+    }
+    else
+    {
+        for (std::size_t i=0; i < bins.size(); i++)
+        {
+            double bin_width = BLOCK_WIDTH * bins[i];
+            svg_text(TEXT_LEFT, top + TEXT_BASELINE, std::to_string(bins[i]));
+            svg_rect(TEXT_WIDTH, top, bin_width, BIN_HEIGHT, color);
+            top += BIN_HEIGHT;
+        }
+        svg_end();
+    }
 }

svg.h

@@ -1,5 +1,5 @@
 #ifndef SVG_H_INCLUDED
 #define SVG_H_INCLUDED
 #include <vector>
-void show_histogram_svg(const std::vector<double>& bins);
+void show_histogram_svg(const std::vector<std::size_t>& bins);
 #endif // SVG_H_INCLUDED