code: исправил svg под свой вариант

.gitignore

@@ -0,0 +1 @@
+.vscode

main.cpp

@@ -1,103 +0,0 @@
-#include <iostream>
-#include <cmath>
-#include <vector>
-using namespace std;
-int main()
-{
- size_t count, bin_count;
-
- size_t i, j;
-    float min, max, bin_size;
-    float low, hi;
-    cerr << "Count= ";
-    cin >> count;
-    cerr << "Bin_count= ";
-    cin >> bin_count;
-    vector<double>numbers(count);
-    vector<size_t>bins(bin_count);
-    for (i = 0; i < count; i++)
-    {
-        cin >> numbers[i];
-    }
-    min = numbers[0];
-    max = numbers[0];
-    for (i = 0; i < count; i++)
-    {
-        if (numbers[i] > max)
-            max = numbers[i];
-        if (numbers[i] < min)
-            min = numbers[i];
-    }
-    bin_size = (max - min) / bin_count;
-    low = min;
-    hi = low + bin_size;
-    for ( i = 0; i < count; i++)
-    {
-        bool found = false;
-        for (j = 0; (j < bin_count -1) && !found; j++)
-        {
-            low = min + j * bin_size;
-            hi = min + (j + 1) * bin_size;
-            if ((low <= numbers[i]) && (numbers[i] < hi))
-            {
-                bins[j]++;
-                found = true;
-            }
-        }
-        if (found==false)
-        {
-            bins[bin_count - 1]++;
-        }
-    }
-
-
-    size_t sum_bins=0;
-    for (size_t bin:bins)
-    {
-        sum_bins+=bin;
-    }
-    size_t sred_bin = sum_bins/bin_count;
-
-    const size_t SCREEN_WIDTH = 80;
-    const size_t MAX_ASTERISK = SCREEN_WIDTH - 3 - 1;
-
-    size_t max_bin=bins[0];
-    for (size_t bin:bins)
-        if (bin>max_bin)
-            max_bin=bin;
-    for (size_t bin:bins)
-    {
-        int height = bin;
-        if (max_bin > MAX_ASTERISK)
-        {
-            height = MAX_ASTERISK * (static_cast<double>(bin) / max_bin);
-        }
-        if (bin < 100)
-            cout << " ";
-        if (bin < 10)
-            cout << " ";
-        cout<<bin<<"|";
-         if (height>sred_bin){
-             for(size_t i=0; i<sred_bin; i++)
-                 cout<<"*";
-             for(size_t i=sred_bin; i<height; i++)
-                 cout<<"+";
-         }
-         else{
-             for (size_t i=0; i<height; i++)
-                 cout<<"*";
-             for (size_t i=height; i<sred_bin; i++)
-                 cout<<"-";
-
-         }
-
-cout<<endl;
-
-    }
-
-
-
-    return 0;
-
-
-}

project/histogram.cpp

@@ -0,0 +1,43 @@
+#include <iostream>
+#include <vector>
+#include "histogram.h"
+using namespace std;
+void
+find_minmax(vector<double> numbers, double& min, double& max) {
+    min = numbers[0];
+    max = numbers[0];
+    for (double x : numbers) {
+    if (x < min) {
+        min = x;
+    }
+    else if (x > max) {
+        max = x;
+    }
+}
+}
+
+vector<size_t>
+make_histogram(vector<double> numbers, size_t bin_count) {
+    vector <size_t> bins(bin_count);
+    double min, max;
+    find_minmax(numbers, min, max);
+    size_t countt;
+    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;
+
+
+}

project/histogram.h

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

project/main.cpp

@@ -0,0 +1,32 @@
+#include <iostream>
+#include <vector>
+#include "histogram.h"
+#include "text.h"
+#include "svg.h"
+using namespace std;
+struct Input {
+    vector<double> numbers;
+    size_t bin_count{};
+};
+
+Input
+input_data(){
+    size_t number_count;
+    cerr << "Enter number count: ";
+    cin >> number_count;
+    Input in;
+    in.numbers.resize(number_count);
+    for(int i;i<number_count;i++)
+    {
+        cin >> in.numbers[i];
+    }
+    cerr << "Enter bin count: ";
+    cin >> in.bin_count;
+    return in;
+}
+int main()
+{   Input in = input_data();
+    auto bins = make_histogram(in.numbers, in.bin_count);
+    show_histogram_svg(bins);
+    return 0;
+}

project/svg.cpp

@@ -0,0 +1,65 @@
+#include <math.h>
+#include <iostream>
+#include <conio.h>
+#include <vector>
+#include <string>
+#include "svg.h"
+using namespace std;
+
+void
+svg_begin(double width, double height) {
+    cout << "<?xml version='1.0' encoding='UTF-8'?>\n";
+    cout << "<svg ";
+    cout << "width='" << width << "' ";
+    cout << "height='" << height << "' ";
+    cout << "viewBox='0 0 " << width << " " << height << "' ";
+    cout << "xmlns='http://www.w3.org/2000/svg'>\n";
+}
+
+void
+svg_end() {
+    cout << "</svg>\n";
+}
+void
+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 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 = 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];
+    for (size_t i = 0; i < bins.size(); i++) {
+        if (bins[i] > max_count)
+            max_count = bins[i];
+    }
+    for (size_t bin : bins) {
+        const double bin_width = MAX_WIDTH * (bin/max_count);
+        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();
+}

project/svg.h

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

project/text.cpp

@@ -0,0 +1,42 @@
+#include <iostream>
+#include <vector>
+#include "text.h"
+#include "histogram.h"
+using namespace std;
+void
+show_histogram_text(vector<size_t> bins, size_t bin_count){
+    const size_t SCREEN_WIDTH = 80;
+    const size_t MAX_ASTERISK = SCREEN_WIDTH - 3 - 1;
+        size_t max_count = 0;
+        for (size_t i = 0; i < bin_count; i++){
+        if(bins[i]>max_count)
+        max_count = bins[i];
+        }
+    size_t height;
+    for (size_t i = 0; i < bin_count; i++)
+    {
+        if (bins[i] < 100)
+            cout << " ";
+        if (bins[i] < 10)
+            cout << " ";
+        cout<<bins[i]<<"|";
+        if(max_count>MAX_ASTERISK){
+        for (size_t j = 0; j <(height = MAX_ASTERISK * (static_cast<double>(bins[i]) / max_count)) ; j++)
+        {
+            cout<<"*";
+        }
+        cout<<endl;
+        }
+        else
+        {
+           for (size_t j = 0; j <bins[i] ; j++)
+        {
+            cout<<"*";
+        }
+        cout<<endl;
+        }
+    }
+    return;
+
+
+}

project/text.h

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

unittest.cpp

@@ -0,0 +1,16 @@
+#define DOCTEST_CONFIG_NO_MULTITHREADING
+#define DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN
+#include "doctest.h"
+#include "project\histogram_internal.h"
+
+TEST_CASE("distinct positive numbers") {
+    double min = 0;
+    double max = 0;
+    std::vector<double>v{2,1};
+    CHECK(v.size() != 0);
+    CHECK(v.size() != 1);
+    find_minmax({1, 2}, min, max);
+	CHECK(min == 1);;
+    CHECK(max == 2);
+	CHECK(min != max);
+}