build: uniq variant

labor01.cpp

@@ -9,6 +9,7 @@ using namespace std;
 struct Input {
     vector<double> numbers;
     size_t bin_count{};
+    vector<string> colors;
 };
 
 Input
@@ -24,9 +25,14 @@ input_data() {
     }
     cerr << "Enter bin_count: ";
     cin >> in.bin_count;
+    in.colors.resize(in.bin_count);
     sort(begin(in.numbers), end(in.numbers));
     in.numbers.erase(unique(begin(in.numbers), end(in.numbers)), end(in.numbers));
     number_count = in.numbers.size();
+    cerr << "Enter colors: ";
+    for (size_t i = 0; i < in.bin_count; i++) {
+        cin >> in.colors[i];
+    }
     return in;
 }
 
@@ -35,7 +41,7 @@ input_data() {
 int main() {
     auto in = input_data();
     auto bins = make_histogram(in.numbers, in.bin_count);
-    show_histogram_svg(bins);
+    show_histogram_svg(bins, in.colors);
 }
        
        

svg.cpp

@@ -1,24 +1,19 @@
 #include <iostream>
 #include <vector>
 #include <string>
-#include "svg.h"
+#include "svg_iternal.h"
 
 using namespace std;
 
-void
+void svg_text(double left, double baseline, string text) {
-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 = "black", string fill = "black")
+void svg_rect(double x, double y, double width, double height, string stroke = "black", string fill = "black") {
-{
+    cout << "<rect x='" << x << "' y='" << y << "' width='" << width << "' height='" << height << "' fill='" << fill << "' stroke='" << stroke << "' />\n";
-    cout << "<rect x='" << x << "' y='" << y << "' width='" <<
-        width << "' height='" << height << "' fill='" << fill <<
-        "' stroke='" << stroke <<"' />\n";
 }
 
-void
+void svg_begin(double width, double height) {
-svg_begin(double width, double height) {
     cout << "<?xml version='1.0' encoding='UTF-8'?>\n";
     cout << "<svg ";
     cout << "width='" << width << "' ";
@@ -27,13 +22,20 @@ svg_begin(double width, double height) {
     cout << "xmlns='http://www.w3.org/2000/svg'>\n";
 }
 
-void
+void svg_end() {
-svg_end() {
     cout << "</svg>\n";
 }
 
-void
+string check_color(const string& color) {
-show_histogram_svg(const vector<size_t>& bins) {
+    if (color.find(" ") == -1 || color.find('#') == 0) {
+        return color;
+    }
+    else {
+        return "black";
+    }
+}
+
+void show_histogram_svg(const vector<size_t>& bins, const vector<string>& colors) {
     const auto IMAGE_WIDTH = 400;
     const auto IMAGE_HEIGHT = 300;
     const auto TEXT_LEFT = 20;
@@ -43,14 +45,11 @@ show_histogram_svg(const vector<size_t>& bins) {
     const auto BLOCK_WIDTH = 10;
     svg_begin(400, 300);
     double top = 0;
-    for (size_t bin : bins) {
+    for (size_t j = 0; j < bins.size(); j++) {
-        const double bin_width = BLOCK_WIDTH * bin;
+        const double bin_width = BLOCK_WIDTH * bins[j];
-        svg_text(TEXT_LEFT, top + TEXT_BASELINE, to_string(bin));
+        svg_text(TEXT_LEFT, top + TEXT_BASELINE, to_string(bins[j]));
-        svg_rect(TEXT_WIDTH, top, bin_width, BIN_HEIGHT);
+        svg_rect(TEXT_WIDTH, top, bin_width, BIN_HEIGHT, check_color(colors[j]), "black");
         top += BIN_HEIGHT;
     }
     svg_end();
 }
-
-
-

svg.h

@@ -4,6 +4,6 @@
 #include <vector>
 
 void
-show_histogram_svg(const std::vector<size_t>& bins);
+show_histogram_svg(const std::vector<size_t>& bins, const std::vector<std::string>& colors);
 
 #endif // SVG_H_INCLUDED

unittest.cpp

@@ -2,6 +2,8 @@
 #define DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN
 #include "doctest.h"
 #include "histogram_internal.h"
+#include <iostream>
+#include "svg_iternal.h"
 
 TEST_CASE("distinct positive numbers") {
     double min = 0;
@@ -35,3 +37,14 @@ TEST_CASE("one number") {
     CHECK(max == 2);
 }
 
+
+TEST_CASE("Valid color without spaces") {
+    CHECK(check_color("red") == "red");
+}
+
+TEST_CASE("Invalid color with spaces") {
+    CHECK(check_color("light blue") == "black");
+}
+
+TEST_CASE("Valid color not starting with #") {
+    CHECK(check_color("FFFFFF") == "FFFFFF");