code: проверка на нулевой массив

histogram.cpp

@@ -3,12 +3,18 @@
 #include <vector>
 using namespace std;
 
-void find_minmax( vector<double> numbers, double &min, double &max)
+bool find_minmax( vector<double> numbers, double &min, double &max)
 {
+    if (numbers.empty())
+    {
+        return false;
+    }
+
     min = numbers[0];
     max = numbers[0];
-       for (double x : numbers)
+    for (double x : numbers)
     {
+        max = x;
         if (x < min)
         {
             min = x;
@@ -18,7 +24,7 @@ void find_minmax( vector<double> numbers, double &min, double &max)
             max = x;
         }
     }
-    return;
+    return true;
 }
 
 vector<size_t> make_histogram (vector<double> numbers, size_t bin_count)

main.cpp

@@ -35,7 +35,6 @@ int main()
     auto in = input_data();
     auto bins = make_histogram(in.numbers, in.bin_count);
     show_histogram_svg(bins);
-    getch();
     return 0;
 }
 

svg.cpp

@@ -4,6 +4,7 @@
 #include <vector>
 #include <string>
 #include "swg.h"
+#include "sr.h"
 
 using namespace std;
 
@@ -38,6 +39,7 @@ svg_rect(double x, double y, double width, double height, string stroke = "black
 }
 
 
+
 void
 show_histogram_svg(const vector<size_t>& bins)
 {
@@ -50,8 +52,10 @@ show_histogram_svg(const vector<size_t>& bins)
     const auto BLOCK_WIDTH = 10;
     const auto BLACK = "black";
     const auto RED = "red";
+    const auto GREEN = "green";
     const auto MAX_WIDTH = IMAGE_WIDTH-TEXT_WIDTH;
 
+    size_t x = sr(bins);
 
     svg_begin(IMAGE_WIDTH,IMAGE_HEIGHT);
 
@@ -65,11 +69,18 @@ show_histogram_svg(const vector<size_t>& bins)
         }
     }
 
+
     for (size_t bin : bins)
     {
         double bin_width = (MAX_WIDTH)*(bin/max_count);
         svg_text(TEXT_LEFT, top + TEXT_BASELINE, to_string(bin));
-        svg_rect(TEXT_WIDTH, top, bin_width, BIN_HEIGHT, BLACK, RED);
+        if (bin_width<=MAX_WIDTH/max_count*x)
+        {
+            svg_rect(TEXT_WIDTH, top, bin_width, BIN_HEIGHT, BLACK, GREEN);
+        }
+        else{
+            svg_rect(TEXT_WIDTH, top, bin_width, BIN_HEIGHT, BLACK, RED);
+            }
         top += BIN_HEIGHT;
     }
 

unittest.cpp

@@ -2,6 +2,7 @@
 #define DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN
 #include "doctest.h"
 #include "histogram_internal.h"
+#include "sr.h"
 
 
 TEST_CASE("distinct positive numbers") {
@@ -38,3 +39,11 @@ TEST_CASE("vector with same elements") {
     CHECK(min == 2);
     CHECK(max == 2);
 }
+TEST_CASE("Empty vector"){
+    double min = 0;
+    double max = 0;
+    std::vector<double> numbers {};
+    CHECK(find_minmax(numbers, min, max) == false);
+
+}
+