вывод гистограммы в svg формате

histogram.cpp

@@ -1,16 +1,21 @@
 #include "histogram.h"
 bool
-find_minmax(const std::vector<double>& numbers, double& min, double& max) {
+find_minmax(std::vector<double> numbers, double& min, double& max) {
+    if(numbers.size() == 0){
+        return false;
+    }
     min = numbers[0];
     max = numbers[0];
-    for(double x : numbers){
-        if(x<min){
-            min=x;
+    for (double x : numbers) {
+        if (x < min) {
+            min = x;
         }
-        if(x>max){
-            max=x;
+        else if (x > max)
+        {
+                max = x;
         }
     }
+    return true;
 }
 std::vector<size_t>
 make_histogram(const std::vector<double>& numbers,size_t bin_count){

histogram.h

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

main.cpp

@@ -1,6 +1,8 @@
+#include "histogram.h"
+#include "text.h"
 #include <iostream>
 #include <vector>
-
+#include "svg.h"
 using namespace std;
 struct Input {
     vector<double> numbers;
@@ -20,95 +22,11 @@ input_data(){
     cin >> in.bin_count;
     return in;
 }
-void
-find_minmax(const vector<double>& numbers, double& min, double& max) {
-    min = numbers[0];
-    max = numbers[0];
-    for(double x : numbers){
-        if(x<min){
-            min=x;
-        }
-        if(x>max){
-            max=x;
-        }
-    }
-}
-vector<size_t>
-make_histogram(const vector<double>& numbers,size_t bin_count){
-    vector<size_t> bins(bin_count);
-    double min,max;
-    find_minmax(numbers,min,max);
-    double bin_size=(max-min)/bin_count;
-    for(size_t i=0; i<numbers.size(); i++){
-        bool found = false;
-        for(size_t j=0;(j<bin_count-1)&& !found; j++){
-            auto lo=min+j*bin_size;
-            auto hi=min+(j+1)*bin_size;
-            if((lo<=numbers[i])&&(numbers[i]<hi)){
-                bins[j]++;
-                found=true;
-            }
-        }if(!found){
-            bins[bin_count-1]++;
-        }
-    }
-    return bins;
-}
-void
-show_histogram(vector<size_t>bins,size_t bin_count){
-    size_t Maxbins = 0;
-    for (size_t i = 0; i < bin_count; i++)
-    {
-        if (bins[i] > Maxbins)
-        {
-            Maxbins = bins[i];
-        }
-    }
-    const size_t MAX_HEIGHT = 76;
-    if (Maxbins <= MAX_HEIGHT)
-    {
-        for (size_t i = 0; i < bin_count; i++)
-        {
-            if (bins[i] < 10)
-            {
-                cout << " ";
-            }
-            cout << " " << bins[i]<< "|";
-            for (size_t j = 0; j < bins[i]; j++)
-            {
-                cout << "*";
-            }
-            cout << endl;
-        }
-    }
-    else
-    {
-        for (size_t i = 0; i < bin_count; i++)
-        {
-            size_t height = static_cast<size_t>(MAX_HEIGHT * (static_cast<double>(bins[i]) / Maxbins));
-
-            if (bins[i] < 100)
-            {
-                cout << " ";
-            }
-            if (bins[i] < 10)
-            {
-                cout << " ";
-            }
-            cout << bins[i] << "|";
-            for (size_t j = 0; j < height; j++)
-            {
-                cout << "*";
-            }
-            cout << endl;
-        }
-    }
-}
 int
 main() {
     auto in = input_data();
     auto bins = make_histogram(in.numbers, in.bin_count);
-    show_histogram(bins,in.bin_count);
+    show_histogram_svg(bins);
     return 0;
 }
 

svg.cpp

@@ -0,0 +1,48 @@
+#include "svg.h"
+void
+svg_begin(double width, double height) {
+    std::cout << "<?xml version='1.0' encoding='UTF-8'?>\n";
+    std::cout << "<svg ";
+    std::cout << "width='" << width << "' ";
+    std::cout << "height='" << height << "' ";
+    std::cout << "viewBox='0 0 " << width << " " << height << "' ";
+    std::cout << "xmlns='http://www.w3.org/2000/svg'>\n";
+}
+
+void
+svg_end() {
+    std::cout << "</svg>\n";
+}
+void
+svg_text(double left, double baseline, std::string text) {
+    std::cout << "<text x='" << left << "' y='" << baseline << "'>" << text << "</text>";
+}
+void
+svg_rect(double x,double y,double width,double height,std::string stroke = "red",std::string fill= "black"){
+    std::cout << "<rect x='"<<x<<"' y='"<<y<<"' width='"<<width<<"' height='"<<height<<"' stroke='"<<stroke<<"' fill='"<<fill<<"' />";}
+void
+show_histogram_svg(const std::vector<size_t>& 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;
+    const auto COLOUR_1 = "green";
+    const auto COLOUR_2 = "blue";
+    svg_begin(400, 300);
+
+    double top = 0;
+    for (size_t bin : bins)
+        {
+        const double bin_width = BLOCK_WIDTH * bin;
+        svg_text(TEXT_LEFT, top + TEXT_BASELINE, std::to_string(bin));
+        svg_rect(TEXT_WIDTH, top, bin_width, BIN_HEIGHT,COLOUR_1,COLOUR_2);
+        top += BIN_HEIGHT;
+    }
+
+    svg_end();
+}
+
+

svg.h

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

text.cpp

@@ -0,0 +1,51 @@
+#include "text.h"
+void
+show_histogram_text(std::vector<size_t>bins,size_t bin_count){
+    size_t Maxbins = 0;
+    for (size_t i = 0; i < bin_count; i++)
+    {
+        if (bins[i] > Maxbins)
+        {
+            Maxbins = bins[i];
+        }
+    }
+    const size_t MAX_HEIGHT = 76;
+    if (Maxbins <= MAX_HEIGHT)
+    {
+        for (size_t i = 0; i < bin_count; i++)
+        {
+            if (bins[i] < 10)
+            {
+                std::cout << " ";
+            }
+            std::cout << " " << bins[i]<< "|";
+            for (size_t j = 0; j < bins[i]; j++)
+            {
+                std::cout << "*";
+            }
+            std::cout << std::endl;
+        }
+    }
+    else
+    {
+        for (size_t i = 0; i < bin_count; i++)
+        {
+            size_t height = static_cast<size_t>(MAX_HEIGHT * (static_cast<double>(bins[i]) / Maxbins));
+
+            if (bins[i] < 100)
+            {
+                std::cout << " ";
+            }
+            if (bins[i] < 10)
+            {
+                std::cout << " ";
+            }
+            std::cout << bins[i] << "|";
+            for (size_t j = 0; j < height; j++)
+            {
+                std::cout << "*";
+            }
+            std::cout << std::endl;
+        }
+    }
+}

text.h

@@ -0,0 +1,8 @@
+#ifndef TEXT_H_INCLUDED
+#define TEXT_H_INCLUDED
+#include <vector>
+#include <iostream>
+void
+show_histogram_text(std::vector<size_t>bins,size_t bin_count);
+
+#endif