diff --git a/.gitignore b/.gitignore index 4c7473d..0a4fc6b 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ /bin /obj +/curl diff --git a/7112 b/7112 deleted file mode 100644 index fce8b58..0000000 --- a/7112 +++ /dev/null @@ -1,8 +0,0 @@ ------BEGIN OPENSSH PRIVATE KEY----- -b3BlbnNzaC1rZXktdjEAAAAACmFlczI1Ni1jdHIAAAAGYmNyeXB0AAAAGAAAABAqjR8VKL -iXqwsebTTkYzLtAAAAGAAAAAEAAAAzAAAAC3NzaC1lZDI1NTE5AAAAIAMVcWMSwkHQ796Q -v12uM1/L9QSqCC1guyCtw8nZgqYaAAAAoAX6y1g+sl014TmIQ7zX/gv2ngRTEKBcujJq8O -UqkMywAQC10aGheZuBego39vP3S84Tf+kKNzxIUWu+kRpbgi4x2bIc5/kYbYh76DGK+o9z -zCGU6ju3j1fNVHknGYkR0aw2SSu9/Q8GjU+xMd5Rdqj567rbHY/w7Qt8ZYImEKVvYoO/6G -BenNIJk2c3S/lY26lh51GG9DF9PKMrnWNhZIY= ------END OPENSSH PRIVATE KEY----- diff --git a/7112.pub b/7112.pub deleted file mode 100644 index 2db8a5b..0000000 --- a/7112.pub +++ /dev/null @@ -1 +0,0 @@ -ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIAMVcWMSwkHQ796Qv12uM1/L9QSqCC1guyCtw8nZgqYa aleks@DESKTOP-3A8L66V diff --git a/laba1.depend b/laba1.depend index 6748395..c602164 100644 --- a/laba1.depend +++ b/laba1.depend @@ -1,10 +1,11 @@ # depslib dependency file v1.0 -1748812442 source:c:\users\aleks\onedrive\Рабочий стол\laba1\main.cpp +1748850108 source:c:\users\aleks\onedrive\Рабочий стол\laba1\main.cpp "histogram.h" "text.h" "svg.h" + 1748386910 c:\users\aleks\onedrive\Рабочий стол\laba1\histogram.h @@ -78,6 +79,8 @@ "histogram_internal.h" +1748808114 D + 1748875465 source:c:\users\aleks\onedrive\Рабочий стол\laba1 — копияbb\histogram.cpp "histogram.h" "histogram_internal.h" @@ -110,7 +113,64 @@ -1748876656 source:c:\users\aleks\onedrive\Рабочий стол\laba1 — копияbb\svg.cpp +1749628551 source:c:\users\aleks\onedrive\Рабочий стол\laba1 — копияbb\svg.cpp "svg.h" +1748876656 + +1748849797 c:\users\aleks\onedrive\Рабочий стол\laba1\curl\include\curl\curl.h + "curlver.h" + "system.h" + + + + + + + + + + + "easy.h" + "multi.h" + "urlapi.h" + "options.h" + "header.h" + "websockets.h" + "mprintf.h" + "typecheck-gcc.h" + +1748849797 c:\users\aleks\onedrive\Рабочий стол\laba1\curl\include\curl\curlver.h + +1748849797 c:\users\aleks\onedrive\Рабочий стол\laba1\curl\include\curl\system.h + + + + + + + +1748849797 c:\users\aleks\onedrive\Рабочий стол\laba1\curl\include\curl\easy.h + +1748849797 c:\users\aleks\onedrive\Рабочий стол\laba1\curl\include\curl\multi.h + "curl.h" + +1748849797 c:\users\aleks\onedrive\Рабочий стол\laba1\curl\include\curl\urlapi.h + "curl.h" + +1748849797 c:\users\aleks\onedrive\Рабочий стол\laba1\curl\include\curl\options.h + +1748849797 c:\users\aleks\onedrive\Рабочий стол\laba1\curl\include\curl\header.h + +1748849797 c:\users\aleks\onedrive\Рабочий стол\laba1\curl\include\curl\websockets.h + +1748849797 c:\users\aleks\onedrive\Рабочий стол\laba1\curl\include\curl\mprintf.h + + + "curl.h" + +1748849797 c:\users\aleks\onedrive\Рабочий стол\laba1\curl\include\curl\typecheck-gcc.h + +1748849797 c4f7fe14afe3358e7b9d7bc3578a9c995ebd7 + diff --git a/main.cpp b/main.cpp index 23e7f85..02ee14e 100644 --- a/main.cpp +++ b/main.cpp @@ -9,11 +9,9 @@ using namespace std; struct Input { vector numbers; - size_t bin_count; }; - Input input_data() { Input in; size_t number_count; @@ -28,14 +26,14 @@ Input input_data() { } cerr << "Enter bin count: "; -cin >> in.bin_count; + cin >> in.bin_count; // You were missing this line to read bin_count return in; } int main() { auto in = input_data(); - auto bins = make_histogram(in.numbers, in.bin_count); + auto bins = make_histogram(in.numbers, in.bin_count); // Added second argument show_histogram_svg(bins); return 0; } diff --git a/unittest.depend b/unittest.depend index f7178a6..bf57c86 100644 --- a/unittest.depend +++ b/unittest.depend @@ -1,6 +1,7 @@ # depslib dependency file v1.0 -1748392121 source:c:\users\aleks\onedrive\Рабочий стол\laba1\histogram.cpp +1748808114 source:c:\users\aleks\onedrive\Рабочий стол\laba1\histogram.cpp "histogram.h" + "histogram_internal.h" 1748386910 c:\users\aleks\onedrive\Рабочий стол\laba1\histogram.h @@ -58,11 +59,11 @@ 1748392232 c:\users\aleks\onedrive\Рабочий стол\laba1\histogram_internal.h -1748802937 source:c:\users\aleks\onedrive\Рабочий стол\laba1\svg.cpp +1748811805 source:c:\users\aleks\onedrive\Рабочий стол\laba1\svg.cpp "svg.h" -1748730522 c:\users\aleks\onedrive\Рабочий стол\laba1\svg.h +1748810901 c:\users\aleks\onedrive\Рабочий стол\laba1\svg.h