From 5240446cfa69f8b5a651b8093acc2381fce6ecdc Mon Sep 17 00:00:00 2001 From: OvsiannikovRS Date: Mon, 26 May 2025 21:39:10 +0300 Subject: [PATCH] =?UTF-8?q?=D1=84=D0=B8=D0=BD=D0=B0=D0=BB=D1=8C=D0=BD?= =?UTF-8?q?=D1=8B=D0=B9=20=D0=BA=D0=BE=D0=BC=D0=BC=D0=B8=D1=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- LR3/histogram.cpp | 9 +++- LR3/histogram_internal.h | 2 +- LR3/main.cpp | 88 +++++++++++++++++++++++++++++++--------- LR3/unittest.cpp | 15 +++++++ LR3/unittest.depend | 4 +- 5 files changed, 95 insertions(+), 23 deletions(-) diff --git a/LR3/histogram.cpp b/LR3/histogram.cpp index 3c86d4a..b9a25d1 100644 --- a/LR3/histogram.cpp +++ b/LR3/histogram.cpp @@ -5,8 +5,13 @@ using namespace std; -void +bool find_minmax(vector numbers, double& min, double& max) { + if (numbers.empty()) { + min = max = 0; + return false; + } + else{ min = numbers[0]; max = numbers[0]; for (double x : numbers) { @@ -17,6 +22,8 @@ find_minmax(vector numbers, double& min, double& max) { max = x; } } + return true; + } } vector diff --git a/LR3/histogram_internal.h b/LR3/histogram_internal.h index 737dbd1..ccb11b3 100644 --- a/LR3/histogram_internal.h +++ b/LR3/histogram_internal.h @@ -5,5 +5,5 @@ using namespace std; -void +bool find_minmax(vector numbers, double& min, double& max); diff --git a/LR3/main.cpp b/LR3/main.cpp index 228da12..d67e63b 100644 --- a/LR3/main.cpp +++ b/LR3/main.cpp @@ -4,46 +4,96 @@ #include "text.h" #include "svg.h" #include +#include +#include using namespace std; + + struct Input{ vector numbers; size_t bin_count{}; }; Input -input_data(){ - Input in; +input_data(istream& in, bool prompt) +{ + 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); - for (size_t i = 0; i < number_count; i++) { - cin >> in.numbers[i]; + 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++) + { + in >> cin.numbers[i]; } - cin >> in.bin_count; - return in; + + cerr << binCntPrmt; + 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(ctx); + buffer->write(reinterpret_cast(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 argc, char* argv[]) { Input input; if (argc > 1) { - CURL *curl = curl_easy_init(); - if(curl) { - CURLcode res; - curl_easy_setopt(curl, CURLOPT_URL, argv[1]); - res = curl_easy_perform(curl); - curl_easy_cleanup(curl); - } - return 0; + input = download(argv[1]); + } else { + input = input_data(cin, true); } - curl_global_init(CURL_GLOBAL_ALL); - auto in = input_data(); - auto bins = make_histogram(in.numbers, in.bin_count); + auto bins = make_histogram(input.numbers, input.bin_count); show_histogram_svg(bins); } diff --git a/LR3/unittest.cpp b/LR3/unittest.cpp index 7b62f70..9cae758 100644 --- a/LR3/unittest.cpp +++ b/LR3/unittest.cpp @@ -27,3 +27,18 @@ TEST_CASE(" CHECK(min == -2); CHECK(max == -1); } + +TEST_CASE("одинаковые числа") +{ + double min = 0; + double max = 0; + find_minmax({1, 1}, min, max); + CHECK(min == max); +} + +TEST_CASE("distinct equals numbers") +{ + double min = 0; + double max = 0; + CHECK(!find_minmax({}, min, max)); +} diff --git a/LR3/unittest.depend b/LR3/unittest.depend index 5dac4f7..de2f151 100644 --- a/LR3/unittest.depend +++ b/LR3/unittest.depend @@ -1,5 +1,5 @@ # depslib dependency file v1.0 -1748202161 source:c:\users\daemo\onedrive\Рабочий стол\lab03\lr3\histogram.cpp +1748284319 source:c:\users\daemo\onedrive\Рабочий стол\lab03\lr3\histogram.cpp "histogram.h" "histogram_internal.h" @@ -7,6 +7,6 @@ 1748199863 c:\users\daemo\onedrive\Рабочий стол\lab03\lr3\histogram.h -1748202619 c:\users\daemo\onedrive\Рабочий стол\lab03\lr3\histogram_internal.h +1748284462 c:\users\daemo\onedrive\Рабочий стол\lab03\lr3\histogram_internal.h