4.svg

histogram.cpp

@@ -27,7 +27,7 @@ make_histogram(const vector<double>& numbers, size_t bin_count)
     vector<double> bins;
     bins.resize(bin_count);
 
-    size_t cor_size = (max1 - min1)/bin_count;
+    double cor_size = (max1 - min1)/bin_count;
 
     for (size_t i = 0; i < numbers.size(); i++)
     {
@@ -36,7 +36,7 @@ make_histogram(const vector<double>& numbers, size_t bin_count)
         {
             auto L = min1 + j*cor_size;
             auto H = min1 + (j+1)*cor_size;
-            if ((L <= numbers[i]) && (numbers[i] <= H))
+            if ((L <= numbers[i]) && (numbers[i] < H))
             {
                 flag = true;
                 bins[j]++;

main.cpp

@@ -2,6 +2,7 @@
 #include <vector>
 #include <cmath>
 #include "histogram.h"
+#include "svg.h"
 
 using namespace std;
 
@@ -16,17 +17,14 @@ input_data()
 {
 
     size_t number_count;
-    cerr << "vvedite col-vo numbers:";
     cin >> number_count;
     Input in;
 
     in.numbers.resize(number_count);
     for (size_t i = 0; i < number_count; i++)
     {
-        cerr << "N[" << i << "]=";
         cin >> in.numbers[i];
     }
-    cerr << "vvedite col-vo count:";
     cin >> in.bin_count;
     return in;
 }
@@ -36,5 +34,5 @@ main()
 {
     auto in = input_data();
     auto bins = make_histogram(in.numbers, in.bin_count);
-    show_histogram_text(bins, in.numbers, in.bin_count);
+    show_histogram_svg(bins);
 }