Before

2025-06-06 12:33:22 +03:00
--- a/.gitignore
+++ b/.gitignore
@@ -0,0 +1,3 @@
+/bin
+/obj
+/curl
--- a/lab01.cbp
+++ b/lab01.cbp
@@ -30,8 +30,18 @@
 		</Build>
 		<Compiler>
 			<Add option="-Wall" />
+			<Add option="-m64" />
 			<Add option="-fexceptions" />
+			<Add directory="curl/include" />
 		</Compiler>
+		<Linker>
+			<Add option="-static-libstdc++" />
+			<Add option="-static-libgcc" />
+			<Add option="-static" />
+			<Add option="-m64" />
+			<Add library="curl/lib/libcurl.dll.a" />
+			<Add directory="curl/lib" />
+		</Linker>
 		<Unit filename=".gitignore" />
 		<Unit filename="histogram.cpp" />
 		<Unit filename="histogram.h" />
--- a/lab01.depend
+++ b/lab01.depend
@@ -0,0 +1,175 @@
+# depslib dependency file v1.0
+1748128397 source:c:\users\lenovo\documents\labsproga2sem\firstlaba\lab01\main.cpp
+	<iostream>
+	<vector>
+	"histogram.h"
+	"text.h"
+	"svg.h"
+	<curl/curl.h>
+	<sstream>
+	<string>
+
+1745848382 source:c:\users\lenovo\documents\labsproga2sem\firstlaba\lab01\histogram.cpp
+	"histogram.h"
+	<iostream>
+	<vector>
+
+1745845585 c:\users\lenovo\documents\labsproga2sem\firstlaba\lab01\histogram.h
+	<vector>
+
+1745703516 source:c:\users\lenovo\documents\labsproga2sem\firstlaba\lab01\text.cpp
+	"text.h"
+	<iostream>
+	<vector>
+
+1745703516 c:\users\lenovo\documents\labsproga2sem\firstlaba\lab01\text.h
+	<vector>
+
+1745706239 c:\users\lenovo\documents\labsproga2sem\firstlaba\lab01\svg.h
+	<iostream>
+	<vector>
+
+1748031452 source:c:\users\lenovo\documents\labsproga2sem\firstlaba\lab01\svg.cpp
+	"svg.h"
+	<string>
+
+1748032988 c:\users\lenovo\documents\labsproga2sem\firstlaba\lab01\curl\include\curl\curl.h
+	"curlver.h"
+	"system.h"
+	<stdio.h>
+	<limits.h>
+	<sys/param.h>
+	<sys/types.h>
+	<time.h>
+	<winsock2.h>
+	<ws2tcpip.h>
+	<sys/select.h>
+	<sys/socket.h>
+	<sys/time.h>
+	"easy.h"
+	"multi.h"
+	"urlapi.h"
+	"options.h"
+	"header.h"
+	"websockets.h"
+	"mprintf.h"
+	"typecheck-gcc.h"
+
+1748032988 c:\users\lenovo\documents\labsproga2sem\firstlaba\lab01\curl\include\curl\curlver.h
+
+1748032988 c:\users\lenovo\documents\labsproga2sem\firstlaba\lab01\curl\include\curl\system.h
+	<ConditionalMacros.h>
+	<inttypes.h>
+	<inttypes.h>
+	<sys/types.h>
+	<sys/socket.h>
+	<sys/poll.h>
+
+1748032988 c:\users\lenovo\documents\labsproga2sem\firstlaba\lab01\curl\include\curl\easy.h
+
+1748032988 c:\users\lenovo\documents\labsproga2sem\firstlaba\lab01\curl\include\curl\multi.h
+	"curl.h"
+
+1748032988 c:\users\lenovo\documents\labsproga2sem\firstlaba\lab01\curl\include\curl\urlapi.h
+	"curl.h"
+
+1748032988 c:\users\lenovo\documents\labsproga2sem\firstlaba\lab01\curl\include\curl\options.h
+
+1748032988 c:\users\lenovo\documents\labsproga2sem\firstlaba\lab01\curl\include\curl\header.h
+
+1748032988 c:\users\lenovo\documents\labsproga2sem\firstlaba\lab01\curl\include\curl\websockets.h
+
+1748032988 c:\users\lenovo\documents\labsproga2sem\firstlaba\lab01\curl\include\curl\mprintf.h
+	<stdarg.h>
+	<stdio.h>
+	"curl.h"
+
+1748032988 c:\users\lenovo\documents\labsproga2sem\firstlaba\lab01\curl\include\curl\typecheck-gcc.h
+
+1749201288 source:c:\users\liza\desktop\lab01\histogram.cpp
+	"histogram.h"
+	<iostream>
+	<vector>
+
+1745845585 c:\users\liza\desktop\lab01\histogram.h
+	<vector>
+
+1749201122 source:c:\users\liza\desktop\lab01\svg.cpp
+	"svg.h"
+	<string>
+
+1745706239 c:\users\liza\desktop\lab01\svg.h
+	<iostream>
+	<vector>
+
+1745703516 source:c:\users\liza\desktop\lab01\text.cpp
+	"text.h"
+	<iostream>
+	<vector>
+
+1745703516 c:\users\liza\desktop\lab01\text.h
+	<vector>
+
+1749198358 source:c:\users\liza\desktop\lab01\main.cpp
+	<iostream>
+	<vector>
+	<sstream>
+	<string>
+	"histogram.h"
+	"svg.h"
+	"text.h"
+	<curl/curl.h>
+
+1748032988 c:\users\liza\desktop\lab01\curl\include\curl\curl.h
+	"curlver.h"
+	"system.h"
+	<stdio.h>
+	<limits.h>
+	<sys/param.h>
+	<sys/types.h>
+	<time.h>
+	<winsock2.h>
+	<ws2tcpip.h>
+	<sys/select.h>
+	<sys/socket.h>
+	<sys/time.h>
+	"easy.h"
+	"multi.h"
+	"urlapi.h"
+	"options.h"
+	"header.h"
+	"websockets.h"
+	"mprintf.h"
+	"typecheck-gcc.h"
+
+1748032988 c:\users\liza\desktop\lab01\curl\include\curl\curlver.h
+
+1748032988 c:\users\liza\desktop\lab01\curl\include\curl\system.h
+	<ConditionalMacros.h>
+	<inttypes.h>
+	<inttypes.h>
+	<sys/types.h>
+	<sys/socket.h>
+	<sys/poll.h>
+
+1748032988 c:\users\liza\desktop\lab01\curl\include\curl\easy.h
+
+1748032988 c:\users\liza\desktop\lab01\curl\include\curl\multi.h
+	"curl.h"
+
+1748032988 c:\users\liza\desktop\lab01\curl\include\curl\urlapi.h
+	"curl.h"
+
+1748032988 c:\users\liza\desktop\lab01\curl\include\curl\options.h
+
+1748032988 c:\users\liza\desktop\lab01\curl\include\curl\header.h
+
+1748032988 c:\users\liza\desktop\lab01\curl\include\curl\websockets.h
+
+1748032988 c:\users\liza\desktop\lab01\curl\include\curl\mprintf.h
+	<stdarg.h>
+	<stdio.h>
+	"curl.h"
+
+1748032988 c:\users\liza\desktop\lab01\curl\include\curl\typecheck-gcc.h
+
--- a/lab01.layout
+++ b/lab01.layout
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
+<CodeBlocks_layout_file>
+	<FileVersion major="1" minor="0" />
+	<ActiveTarget name="Debug" />
+	<File name="svg.cpp" open="1" top="0" tabpos="5" split="0" active="1" splitpos="0" zoom_1="1" zoom_2="0">
+		<Cursor>
+			<Cursor1 position="2532" topLine="60" />
+		</Cursor>
+	</File>
+	<File name="text.cpp" open="1" top="0" tabpos="6" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+		<Cursor>
+			<Cursor1 position="373" topLine="0" />
+		</Cursor>
+	</File>
+	<File name="histogram.h" open="1" top="0" tabpos="4" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+		<Cursor>
+			<Cursor1 position="102" topLine="0" />
+		</Cursor>
+	</File>
+	<File name=".gitignore" open="1" top="0" tabpos="7" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+		<Cursor>
+			<Cursor1 position="19" topLine="0" />
+		</Cursor>
+	</File>
+	<File name="main.cpp" open="1" top="1" tabpos="2" split="0" active="1" splitpos="0" zoom_1="3" zoom_2="0">
+		<Cursor>
+			<Cursor1 position="2550" topLine="77" />
+		</Cursor>
+	</File>
+	<File name="histogram_internal.h" open="1" top="0" tabpos="1" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+		<Cursor>
+			<Cursor1 position="0" topLine="0" />
+		</Cursor>
+	</File>
+	<File name="histogram.cpp" open="1" top="0" tabpos="3" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+		<Cursor>
+			<Cursor1 position="672" topLine="27" />
+		</Cursor>
+	</File>
+	<File name="text.h" open="1" top="0" tabpos="9" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+		<Cursor>
+			<Cursor1 position="0" topLine="0" />
+		</Cursor>
+	</File>
+	<File name="svg.h" open="1" top="0" tabpos="8" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+		<Cursor>
+			<Cursor1 position="0" topLine="0" />
+		</Cursor>
+	</File>
+</CodeBlocks_layout_file>
--- a/main.cpp
+++ b/main.cpp
@@ -1,11 +1,11 @@
 #include <iostream>
 #include <vector>
-#include "histogram.h"
-#include "text.h"
-#include "svg.h"
-#include <curl/curl.h>
 #include <sstream>
 #include <string>
+#include "histogram.h"
+#include "svg.h"
+#include "text.h"
+#include <curl/curl.h>

 using namespace std;

@@ -15,82 +15,83 @@ 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<stringstream*>(ctx);
-     buffer->write(reinterpret_cast<const char*>(items), data_size);
+
+Input input_data(istream& in, bool prompt = true) {  // Äîáàâëåí ïàðàìåòð prompt ñî çíà÷åíèåì ïî óìîë÷àíèþ
+    Input data;
+    size_t number_count;
+
+    if (prompt) {
+        cerr << "Enter number count: ";
+    }
+    in >> number_count;
+
+    data.numbers.resize(number_count);
+    if (prompt) {
+        cerr << "Enter numbers: ";
+    }
+    for (size_t i = 0; i < number_count; i++) {
+        in >> data.numbers[i];
+    }
+
+    if (prompt) {
+        cerr << "Enter number of bins: ";
+    }
+    in >> data.bin_count;
+
+    return data;
+}
+
+// Callback äëÿ çàïèñè äàííûõ â stringstream
+
+static size_t Write_data(void* items, size_t item_size, size_t item_count, void* ctx) {
+    size_t data_size = item_size * item_count;
+    auto* buffer = reinterpret_cast<stringstream*>(ctx);
+    buffer->write(reinterpret_cast<const char*>(items), data_size);
    return data_size;
 }

-Input
-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;
-    cerr << numbCntPrmt;
-    in >> number_count;
-    cin.numbers.resize(number_count);

-    vector<double> numbers(number_count);
-
-    cerr << numbsPrmt;
-    for (size_t i = 0; i < number_count; i++)
-    {
-        in >> cin.numbers[i];
-    }
-
-    cerr << binCntPrmt;
-    in >> cin.bin_count;
-    return cin;
-}
-
-Input
-download(const string& address) {
+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);
+    if (!curl) {
+        cerr << "Îøèáêà: íå óäàëîñü èíèöèàëèçèðîâàòü cURL" << endl;
+        exit(1);
    }
+
+    // Íàñòðîéêà cURL
+    curl_easy_setopt(curl, CURLOPT_URL, address.c_str());
+    curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, Write_data);
+    curl_easy_setopt(curl, CURLOPT_WRITEDATA, &buffer);
+    curl_easy_setopt(curl, CURLOPT_SSL_VERIFYPEER, 0L); // Îòêëþ÷àåì ïðîâåðêó SSL äëÿ òåñòîâ
+    curl_easy_setopt(curl, CURLOPT_SSL_VERIFYHOST, 0L);
+
+    // Âûïîëíåíèå çàïðîñà
+    CURLcode res = curl_easy_perform(curl);
+    if (res != CURLE_OK) {
+        cerr << "Îøèáêà çàãðóçêè: " << curl_easy_strerror(res) << endl;
+        exit(1);
+    }
+
+    curl_easy_cleanup(curl);
    return input_data(buffer, false);
 }

-int main(int argc, char* argv[])
-{
+int main(int argc, char* argv[]) {
+    curl_global_init(CURL_GLOBAL_ALL);
+
    Input input;
    if (argc > 1) {
        input = download(argv[1]);
-    } else {
+    }
+    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);
+    curl_global_cleanup();
+    return 0;
+
 }
--- a/marks.svg
+++ b/marks.svg
--- a/unittest.depend
+++ b/unittest.depend
@@ -0,0 +1,62 @@
+# depslib dependency file v1.0
+1745848382 source:c:\users\lenovo\documents\labsproga2sem\firstlaba\lab01\histogram.cpp
+	"histogram.h"
+	<iostream>
+	<vector>
+
+1745845585 c:\users\lenovo\documents\labsproga2sem\firstlaba\lab01\histogram.h
+	<vector>
+
+1745849386 source:c:\users\lenovo\documents\labsproga2sem\firstlaba\lab01\unittest.cpp
+	"doctest.h"
+	"histogram_internal.h"
+	<vector>
+
+1745704427 c:\users\lenovo\documents\labsproga2sem\firstlaba\lab01\doctest.h
+	<signal.h>
+	<ciso646>
+	<cstddef>
+	<ostream>
+	<istream>
+	<type_traits>
+	"doctest_fwd.h"
+	<ctime>
+	<cmath>
+	<climits>
+	<math.h>
+	<new>
+	<cstdio>
+	<cstdlib>
+	<cstring>
+	<limits>
+	<utility>
+	<fstream>
+	<sstream>
+	<iostream>
+	<algorithm>
+	<iomanip>
+	<vector>
+	<atomic>
+	<mutex>
+	<set>
+	<map>
+	<unordered_set>
+	<exception>
+	<stdexcept>
+	<csignal>
+	<cfloat>
+	<cctype>
+	<cstdint>
+	<string>
+	<sys/types.h>
+	<unistd.h>
+	<sys/sysctl.h>
+	<AfxWin.h>
+	<windows.h>
+	<io.h>
+	<sys/time.h>
+	<unistd.h>
+
+1745848412 c:\users\lenovo\documents\labsproga2sem\firstlaba\lab01\histogram_internal.h
+	<vector>
+
--- a/unittest.layout
+++ b/unittest.layout
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
+<CodeBlocks_layout_file>
+	<FileVersion major="1" minor="0" />
+	<ActiveTarget name="Debug" />
+	<File name="unittest.cpp" open="0" top="0" tabpos="1" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+		<Cursor>
+			<Cursor1 position="623" topLine="0" />
+		</Cursor>
+	</File>
+	<File name="histogram.cpp" open="0" top="0" tabpos="0" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+		<Cursor>
+			<Cursor1 position="205" topLine="0" />
+		</Cursor>
+	</File>
+	<File name="histogram_internal.h" open="0" top="0" tabpos="0" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+		<Cursor>
+			<Cursor1 position="250" topLine="0" />
+		</Cursor>
+	</File>
+</CodeBlocks_layout_file>