From 75dd677d795d7ee2f49982015182ec3137825615 Mon Sep 17 00:00:00 2001 From: ChirkaAR Date: Fri, 23 May 2025 23:37:48 +0300 Subject: [PATCH 1/6] =?UTF-8?q?code:=20=D0=9F=D0=B5=D1=80=D0=B5=D0=BF?= =?UTF-8?q?=D0=B8=D1=81=D0=B0=D0=BB=20=D1=84-=D0=B8=D1=8E=20input=5Fdata?= =?UTF-8?q?=20=D0=B8=20=D0=B4=D0=BE=D0=B1=D0=B0=D0=B2=D0=B8=D0=BB=20=D0=BD?= =?UTF-8?q?=D0=BE=D0=B2=D1=8B=D0=B9=20=D0=BF=D0=B0=D1=80=D0=B0=D0=BC=D0=B5?= =?UTF-8?q?=D1=82=D1=80=20prompt?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- histogram.cpp | 8 +++++++- histogram_internal.h | 4 ++-- lab01.cbp | 13 +++++++++++++ main.cpp | 25 ++++++++++++++++-------- svg.cpp | 46 ++++++++++++++++++++++++++++++++++++++++---- unittest.cbp | 3 +++ unittest.cpp | 20 +++++++++++++++++++ 7 files changed, 104 insertions(+), 15 deletions(-) diff --git a/histogram.cpp b/histogram.cpp index 0b5f9d1..9637586 100644 --- a/histogram.cpp +++ b/histogram.cpp @@ -3,8 +3,13 @@ #include using namespace std; -void find_minmax(const vector& numbers, double& minN, double& maxN) +//std::vector +bool find_minmax(const vector& numbers, double& minN, double& maxN) { + if (numbers.empty()) { + minN = maxN = 0; + return false; + } minN = numbers[0]; maxN = numbers[0]; @@ -19,6 +24,7 @@ void find_minmax(const vector& numbers, double& minN, double& maxN) maxN = x; } } + return true; } vector make_histogram(const vector& numbers, size_t bin_count) diff --git a/histogram_internal.h b/histogram_internal.h index 54abeff..94c5561 100644 --- a/histogram_internal.h +++ b/histogram_internal.h @@ -3,7 +3,7 @@ #include -std::vector -find_minmax( const std::vector& numbers, double& minN, double& maxN); +//std::vector +bool find_minmax(const std::vector& numbers, double& minN, double& maxN); #endif // HISTOGRAM_INTERNAL_H_INCLUDED diff --git a/lab01.cbp b/lab01.cbp index 247aa25..dbd06a2 100644 --- a/lab01.cbp +++ b/lab01.cbp @@ -33,7 +33,20 @@ + + + + + + + + + + diff --git a/main.cpp b/main.cpp index e48cec4..df53d37 100644 --- a/main.cpp +++ b/main.cpp @@ -13,28 +13,37 @@ 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; - in.numbers.resize(number_count); + cerr << numbCntPrmt; + in >> number_count; + cin.numbers.resize(number_count); vector 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; - return in; + cerr << binCntPrmt; + in >> cin.bin_count; + return cin; } int main() { size_t max_count; - auto in = input_data(); + auto in = input_data(cin, true); auto bins = make_histogram(in.numbers, in.bin_count); show_histogram_svg(bins); } diff --git a/svg.cpp b/svg.cpp index 1036f55..e8c71ce 100644 --- a/svg.cpp +++ b/svg.cpp @@ -2,7 +2,7 @@ #include using namespace std; -svg_begin(double width, double height) { +void svg_begin(double width, double height) { cout << "\n"; cout << "" << text << ""; } + void svg_rect(double x, double y, double width, double height, string stroke = "black", string fill = "black") { cout << ""; } + + + +//Защита +/* +void svg_rect(double x, double y, double width, double height, string stroke = "black", string fill = "black", double fill_opacity = 1.0) { + cout << ""; +} + +void show_histogram_svg(const vector& 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(BLOCK_WIDTH * bin), static_cast(IMAGE_WIDTH - TEXT_WIDTH)); + double opacity = static_cast(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& bins) { const auto IMAGE_WIDTH = 400; const auto IMAGE_HEIGHT = 300; @@ -46,9 +87,6 @@ void show_histogram_svg(const vector& 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(); } diff --git a/unittest.cbp b/unittest.cbp index 7f9621b..534f497 100644 --- a/unittest.cbp +++ b/unittest.cbp @@ -31,6 +31,9 @@ + + + diff --git a/unittest.cpp b/unittest.cpp index e531bdb..7ea135b 100644 --- a/unittest.cpp +++ b/unittest.cpp @@ -2,6 +2,7 @@ #define DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN #include "doctest.h" #include "histogram_internal.h" +#include 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)); } From a5f8509328698c5650a4415ce23c092ad3d2674e Mon Sep 17 00:00:00 2001 From: ChirkaAR Date: Sat, 24 May 2025 23:52:32 +0300 Subject: [PATCH 2/6] =?UTF-8?q?code:=20=D0=B4=D0=BE=D0=B1=D0=B0=D0=B2?= =?UTF-8?q?=D0=BB=D0=B5=D0=BD=D0=BE=20=D0=BF=D0=BE=D0=B4=D0=BA=D0=BB=D1=8E?= =?UTF-8?q?=D1=87=D0=B5=D0=BD=D0=B8=D0=B5=20curl=20=D0=B2=20main?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- main.cpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/main.cpp b/main.cpp index df53d37..9686655 100644 --- a/main.cpp +++ b/main.cpp @@ -3,6 +3,7 @@ #include "histogram.h" #include "text.h" #include "svg.h" +#include using namespace std; @@ -42,6 +43,8 @@ input_data(istream& in, bool prompt) int main() { + curl_global_init(CURL_GLOBAL_ALL); + size_t max_count; auto in = input_data(cin, true); auto bins = make_histogram(in.numbers, in.bin_count); From 67217d9ae5e30b66ad168b6bbab3352c7690cd8e Mon Sep 17 00:00:00 2001 From: ChirkaAR Date: Sun, 25 May 2025 01:51:57 +0300 Subject: [PATCH 3/6] =?UTF-8?q?code:=20=D0=9F=D0=BE=D0=BB=D1=83=D1=87?= =?UTF-8?q?=D0=B5=D0=BD=D0=B8=D0=B5=20=D0=B0=D1=80=D0=B3=D1=83=D0=BC=D0=B5?= =?UTF-8?q?=D0=BD=D1=82=D0=BE=D0=B2=20=D0=BF=D1=80=D0=BE=D0=B3=D1=80=D0=B0?= =?UTF-8?q?=D0=BC=D0=BC=D1=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- main.cpp | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/main.cpp b/main.cpp index 9686655..9e9b7cf 100644 --- a/main.cpp +++ b/main.cpp @@ -41,10 +41,17 @@ input_data(istream& in, bool prompt) return cin; } -int main() +int main(int argc, char* argv[]) { curl_global_init(CURL_GLOBAL_ALL); + if (argc > 1) { + for (int i = 0; i < argc; i++) { + cerr << "argv[" << i << "] = " << argv[i] << endl; + } + return 0; + } + size_t max_count; auto in = input_data(cin, true); auto bins = make_histogram(in.numbers, in.bin_count); From 010f5e900cb725a66e2f33a765ae69af092ea115 Mon Sep 17 00:00:00 2001 From: ChirkaAR Date: Sun, 25 May 2025 02:06:12 +0300 Subject: [PATCH 4/6] =?UTF-8?q?code:=20=D0=9E=D0=B1=D1=80=D0=B0=D0=B1?= =?UTF-8?q?=D0=BE=D1=82=D0=BA=D0=B0=20=D0=BE=D1=88=D0=B8=D0=B1=D0=BE=D0=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- main.cpp | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/main.cpp b/main.cpp index 9e9b7cf..c72a2a4 100644 --- a/main.cpp +++ b/main.cpp @@ -44,6 +44,20 @@ input_data(istream& in, bool prompt) int main(int argc, char* argv[]) { curl_global_init(CURL_GLOBAL_ALL); + CURL *curl = curl_easy_init(); + if(curl) { + CURLcode res; + curl_easy_setopt(curl, CURLOPT_URL, "https://example.com"); + res = curl_easy_perform(curl); + curl_easy_cleanup(curl); + + if (res != 0){ + cerr << curl_easy_strerror(res); + exit(1); + } + curl_easy_cleanup(curl); + + } if (argc > 1) { for (int i = 0; i < argc; i++) { From 952d1a54bb5f74d49527e586304a961937dca7aa Mon Sep 17 00:00:00 2001 From: ChirkaAR Date: Sun, 25 May 2025 02:14:40 +0300 Subject: [PATCH 5/6] =?UTF-8?q?code:=20=D0=A0=D0=B0=D0=B1=D0=BE=D1=82?= =?UTF-8?q?=D0=B0=20=D1=81=20=D0=B1=D1=83=D1=84=D0=B5=D1=80=D0=BE=D0=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- main.cpp | 53 ++++++++++++++++++++++++++++++++++++++--------------- 1 file changed, 38 insertions(+), 15 deletions(-) diff --git a/main.cpp b/main.cpp index c72a2a4..0f543b2 100644 --- a/main.cpp +++ b/main.cpp @@ -4,6 +4,8 @@ #include "text.h" #include "svg.h" #include +#include +#include using namespace std; @@ -13,6 +15,13 @@ struct Input size_t bin_count{}; }; +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(ctx); + buffer->write(reinterpret_cast(items), data_size); + return data_size; +} + Input input_data(istream& in, bool prompt) { @@ -41,29 +50,43 @@ input_data(istream& in, bool prompt) return cin; } -int main(int argc, char* argv[]) -{ - curl_global_init(CURL_GLOBAL_ALL); - CURL *curl = curl_easy_init(); - if(curl) { +Input +download(const string& address) { + stringstream buffer; + + CURL* curl = curl_easy_init(); + if(curl){ CURLcode res; - curl_easy_setopt(curl, CURLOPT_URL, "https://example.com"); + 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); - curl_easy_cleanup(curl); - if (res != 0){ - cerr << curl_easy_strerror(res); - exit(1); + if(!res) { + curl_off_t ul; + res = curl_easy_getinfo(curl, CURLINFO_SIZE_DOWNLOAD_T, &ul); + if(!res) { + cerr<<"Uploaded bytes" << ul << endl; + } } - curl_easy_cleanup(curl); + if (res != 0){ + cerr << curl_easy_strerror(res); + exit(1); + } + curl_easy_cleanup(curl); } + return input_data(buffer, false); +} +int main(int argc, char* argv[]) +{ + Input input; if (argc > 1) { - for (int i = 0; i < argc; i++) { - cerr << "argv[" << i << "] = " << argv[i] << endl; - } - return 0; + input = download(argv[1]); + } else { + input = input_data(cin, true); } size_t max_count; From eafadfd62a918cb67341647a5681dbd83e66f4c7 Mon Sep 17 00:00:00 2001 From: ChirkaAR Date: Mon, 26 May 2025 16:03:57 +0300 Subject: [PATCH 6/6] =?UTF-8?q?code:=20=D0=BF=D0=B5=D1=80=D0=B5=D0=B4=20?= =?UTF-8?q?=D0=B7=D0=B0=D1=89=D0=B8=D1=82=D0=BE=D0=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lab01.cbp | 5 +++++ main.cpp | 20 ++++++++++---------- 2 files changed, 15 insertions(+), 10 deletions(-) diff --git a/lab01.cbp b/lab01.cbp index dbd06a2..a6864f6 100644 --- a/lab01.cbp +++ b/lab01.cbp @@ -31,7 +31,12 @@ + + + + + diff --git a/main.cpp b/main.cpp index 0f543b2..7e9e957 100644 --- a/main.cpp +++ b/main.cpp @@ -15,13 +15,6 @@ struct Input size_t bin_count{}; }; -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(ctx); - buffer->write(reinterpret_cast(items), data_size); - return data_size; -} - Input input_data(istream& in, bool prompt) { @@ -50,6 +43,13 @@ input_data(istream& in, bool prompt) 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(ctx); + buffer->write(reinterpret_cast(items), data_size); + return data_size; +} + Input download(const string& address) { stringstream buffer; @@ -82,15 +82,15 @@ download(const string& address) { int main(int argc, char* argv[]) { + CURL* curl = curl_easy_init(); Input input; if (argc > 1) { input = download(argv[1]); } else { + input = input_data(cin, true); } - size_t max_count; - auto in = input_data(cin, true); - auto bins = make_histogram(in.numbers, in.bin_count); + auto bins = make_histogram(input.numbers, input.bin_count); show_histogram_svg(bins); }