Merge branch 'main' of http://uit.mpei.ru/git/ChirkaAR/cs-lab34

lab01.cbp

@@ -31,9 +31,27 @@
 		<Compiler>
 			<Add option="-Wall" />
 			<Add option="-fexceptions" />
+			<Add directory="curl/include" />
 		</Compiler>
+		<Linker>
+			<Add library="curl/lib/libcurl.dll.a" />
+			<Add directory="curl/lib" />
+		</Linker>
 		<Unit filename=".gitignore" />
+		<Unit filename="histogram.cpp" />
+		<Unit filename="histogram.h" />
+		<Unit filename="histogram_internal.h">
+			<Option target="&lt;{~None~}&gt;" />
+		</Unit>
 		<Unit filename="main.cpp" />
+		<Unit filename="svg.cpp" />
+		<Unit filename="svg.h">
+			<Option target="&lt;{~None~}&gt;" />
+		</Unit>
+		<Unit filename="text.cpp" />
+		<Unit filename="text.h">
+			<Option target="&lt;{~None~}&gt;" />
+		</Unit>
 		<Extensions />
 	</Project>
 </CodeBlocks_project_file>

main.cpp

@@ -3,6 +3,9 @@
 #include "histogram.h"
 #include "text.h"
 #include "svg.h"
+#include <curl/curl.h>
+#include <sstream>
+#include <string>
 
 using namespace std;
 
@@ -13,28 +16,81 @@ struct Input
 };
 
 Input
-input_data()
+input_data(istream& in, bool prompt)
 {
-    Input in;
+    Input cin;
+    string numbCntPrmt, numbsPrmt, binCntPrmt;
+    if (prompt == true) {
+        numbCntPrmt = "Enter number count: ";
+        numbsPrmt = "Enter numbers: ";
+        binCntPrmt = "Enter bin count: ";
+    }
     size_t number_count;
-    cin >> number_count;
+    cerr << numbCntPrmt;
-    in.numbers.resize(number_count);
+    in >> number_count;
+    cin.numbers.resize(number_count);
 
     vector<double> numbers(number_count);
 
+    cerr << numbsPrmt;
     for (size_t i = 0; i < number_count; i++)
     {
-        cin >> in.numbers[i];
+        in >> cin.numbers[i];
     }
 
-    cin >> in.bin_count;
+    cerr << binCntPrmt;
-    return in;
+    in >> cin.bin_count;
+    return cin;
+}
+
+size_t write_data(void* items, size_t item_size, size_t item_count, void* ctx) {
+     size_t data_size = item_size * item_count;
+     stringstream* buffer = reinterpret_cast<stringstream*>(ctx);
+     buffer->write(reinterpret_cast<const char*>(items), data_size);
+    return data_size;
+}
+
+Input
+download(const string& address) {
+    stringstream buffer;
+
+    CURL* curl = curl_easy_init();
+    if(curl){
+        CURLcode res;
+        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) {
+            curl_off_t ul;
+            res = curl_easy_getinfo(curl, CURLINFO_SIZE_DOWNLOAD_T, &ul);
+            if(!res) {
+                cerr<<"Uploaded bytes" << ul << endl;
+            }
+        }
+
+        if (res != 0){
+            cerr << curl_easy_strerror(res);
+            exit(1);
+        }
+        curl_easy_cleanup(curl);
+    }
+    return input_data(buffer, false);
 }
 
-int main()
+int main(int argc, char* argv[])
 {
-    size_t max_count;
+    CURL* curl = curl_easy_init();
-    auto in = input_data();
+    Input input;
-    auto bins = make_histogram(in.numbers, in.bin_count);
+    if (argc > 1) {
+        input = download(argv[1]);
+    } else {
+
+        input = input_data(cin, true);
+    }
+
+    auto bins = make_histogram(input.numbers, input.bin_count);
     show_histogram_svg(bins);
 }

svg.cpp

@@ -2,7 +2,7 @@
 #include <string>
 using namespace std;
 
-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 << "' ";
@@ -19,12 +19,53 @@ 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 = "black", string fill = "black")
 {
     cout << "<rect x='" << x << "' y='" << y << "' width='" << width
               << "' height='" << height << "' stroke='" << stroke << "' fill='" << fill << " '/>";
 }
 
+
+
+
+//Çàùèòà
+/*
+void svg_rect(double x, double y, double width, double height, string stroke = "black", string fill = "black", double fill_opacity = 1.0) {
+    cout << "<rect x='" << x << "' y='" << y << "' width='" << width
+         << "' height='" << height << "' stroke='" << stroke
+         << "' fill='" << fill << "' fill-opacity='" << fill_opacity << "'/>";
+}
+
+void show_histogram_svg(const vector<size_t>& bins) {
+    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;
+
+    size_t max_count = *max_element(bins.begin(), bins.end());
+    if (max_count == 0) max_count = 1;
+
+    svg_begin(IMAGE_WIDTH, IMAGE_HEIGHT);
+    double top = 0;
+
+    for (size_t bin : bins) {
+        const double bin_width = min(static_cast<double>(BLOCK_WIDTH * bin), static_cast<double>(IMAGE_WIDTH - TEXT_WIDTH));
+        double opacity = static_cast<double>(bin) / max_count;
+
+        svg_text(TEXT_LEFT, top + TEXT_BASELINE, to_string(bin));
+        svg_rect(TEXT_WIDTH, top, bin_width, BIN_HEIGHT,
+                "blue", "green", opacity);
+        top += BIN_HEIGHT;
+    }
+
+    svg_end();
+}
+*/
+
 void show_histogram_svg(const vector<size_t>& bins) {
     const auto IMAGE_WIDTH = 400;
     const auto IMAGE_HEIGHT = 300;
@@ -46,9 +87,6 @@ void show_histogram_svg(const vector<size_t>& bins) {
         svg_rect(TEXT_WIDTH, top, bin_width, BIN_HEIGHT, "blue", "green");
         top += BIN_HEIGHT;
     }
-
-    //svg_text(20, 20, to_string(bins[0]));
-    //svg_rect(50, 0, bins[0] * 10, 30);
     svg_end();
 }
 

unittest.cbp

@@ -31,6 +31,9 @@
 		<Compiler>
 			<Add option="-Wall" />
 		</Compiler>
+		<Unit filename="histogram.cpp" />
+		<Unit filename="histogram_internal.h" />
+		<Unit filename="unittest.cpp" />
 		<Extensions>
 			<lib_finder disable_auto="1" />
 		</Extensions>

unittest.cpp

@@ -2,6 +2,7 @@
 #define DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN
 #include "doctest.h"
 #include "histogram_internal.h"
+#include <vector>
 
 TEST_CASE("distinct positive numbers") {
     double min = 0;
@@ -9,7 +10,9 @@ TEST_CASE("distinct positive numbers") {
     find_minmax({1, 2}, min, max);
     CHECK(min == 1);
     CHECK(max == 2);
+    CHECK(find_minmax({1, 2}, min, max));
 }
+
 TEST_CASE("distinct negative numbers")
 {
     double min = 0;
@@ -17,6 +20,7 @@ TEST_CASE("distinct negative numbers")
     find_minmax({-1, -2}, min, max);
     CHECK(min == -2);
     CHECK(max == -1);
+    CHECK(find_minmax({-1, -2}, min, max));
 }
 TEST_CASE("vector 1 element")
 {
@@ -25,4 +29,20 @@ TEST_CASE("vector 1 element")
     find_minmax({1}, min, max);
     CHECK(min == 1);
     CHECK(max == 1);
+    CHECK(find_minmax({1}, min, max));
+}
+TEST_CASE("distinct equals numbers")
+{
+    double min = 0;
+    double max = 0;
+    find_minmax({1, 1}, min, max);
+    CHECK(min == 1);
+    CHECK(max == 1);
+    CHECK(find_minmax({1, 1}, min, max));
+}
+TEST_CASE("distinct empty vector")
+{
+    double min = -1;
+    double max = -1;
+    CHECK(!find_minmax({}, min, max));
 }