build: corrections and uniq var

labor01.cpp

@@ -1,48 +1,42 @@
 #include <iostream>
 #include <vector>
-#include "histogram.h"
-#include <algorithm>
-#include "text.h"
-#include "svg.h"
-#include <curl/curl.h>
 #include <sstream>
 #include <string>
+#include <curl/curl.h>
+#include "histogram.h"
+#include "text.h"
+#include "svg.h"
 
 using namespace std;
-struct Input {
+
+struct Input
+{
     vector<double> numbers;
     size_t bin_count{};
-    vector<string> colors;
 };
 
-Input
+
-input_data(istream& inn, bool promt) {
+Input input_data(istream& stream, bool prompt) {
-    if (promt == true) {
-        cerr << "Sovet:" << endl;
-    }
-    size_t number_count;
-    cerr << "Enter number_count: ";
-    inn >> number_count;
     Input in;
-    cerr << "Enter numbers: ";
+    size_t number_count;
+    if (prompt) {
+        cerr << "Enter number count: ";
+    }
+    stream >> number_count;
     in.numbers.resize(number_count);
     for (size_t i = 0; i < number_count; i++) {
-        inn >> in.numbers[i];
+        if (prompt) {
+            cerr << "Enter number " << i + 1 << ": ";
+        }
+        stream >> in.numbers[i];
     }
-    cerr << "Enter bin_count: ";
+    if (prompt) {
-    inn >> in.bin_count;
+        cerr << "Enter 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++) {
-        inn >> in.colors[i];
     }
+    stream >> in.bin_count;
     return in;
 }
 
-
 size_t
 write_data(void* items, size_t item_size, size_t item_count, void* ctx) {
     size_t data_size = item_size * item_count;
@@ -57,21 +51,23 @@ download(const string& address) {
     CURL* curl = curl_easy_init();
     if (curl) {
         CURLcode res;
+        double start;
         curl_easy_setopt(curl, CURLOPT_URL, address.c_str());
         curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, write_data);
         curl_easy_setopt(curl, CURLOPT_WRITEDATA, &buffer);
         res = curl_easy_perform(curl);
-        if (res != CURLE_OK) {
+        if (res == CURLE_OK) {
-            cerr << curl_easy_strerror(res);
+            res = curl_easy_getinfo(curl, CURLINFO_STARTTRANSFER_TIME, &start);
-            exit(1);
+            if (CURLE_OK == res) {
+                cerr<<"Time: " << start;
+            }
         }
         curl_easy_cleanup(curl);
     }
     return input_data(buffer, false);
 }
 
-
+    int main(int argc, char* argv[]) {
-int main(int argc, char* argv[]) {
     Input input;
     if (argc > 1) {
         input = download(argv[1]);
@@ -80,5 +76,5 @@ int main(int argc, char* argv[]) {
         input = input_data(cin, true);
     }
     const auto bins = make_histogram(input.numbers, input.bin_count);
-    show_histogram_svg(bins, input.colors);
+    show_histogram_svg(bins);
 }

svg.cpp

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

svg.h

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