Сравнить коммиты
4 Коммитов
133ecfbbb6
...
40cc4f7fe1
| Автор | SHA1 | Дата | |
|---|---|---|---|
| 40cc4f7fe1 | |||
| 8296a5cc4e | |||
| 82a8d9f469 | |||
| 72c1e547fe |
1
.gitignore
поставляемый
1
.gitignore
поставляемый
@@ -1,2 +1,3 @@
|
||||
/bin
|
||||
/obj
|
||||
/curl
|
||||
|
||||
8
7112
8
7112
@@ -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-----
|
||||
1
7112.pub
1
7112.pub
@@ -1 +0,0 @@
|
||||
ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIAMVcWMSwkHQ796Qv12uM1/L9QSqCC1guyCtw8nZgqYa aleks@DESKTOP-3A8L66V
|
||||
56
laba1.depend
56
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
|
||||
<iostream>
|
||||
<vector>
|
||||
"histogram.h"
|
||||
"text.h"
|
||||
"svg.h"
|
||||
<curl/curl.h>
|
||||
|
||||
1748386910 c:\users\aleks\onedrive\Ðàáî÷èé ñòîë\laba1\histogram.h
|
||||
<vector>
|
||||
@@ -78,3 +79,56 @@
|
||||
"histogram_internal.h"
|
||||
<vector>
|
||||
|
||||
1748849797 c:\users\aleks\onedrive\Ðàáî÷èé ñòîë\laba1\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"
|
||||
|
||||
1748849797 c:\users\aleks\onedrive\Ðàáî÷èé ñòîë\laba1\curl\include\curl\curlver.h
|
||||
|
||||
1748849797 c:\users\aleks\onedrive\Ðàáî÷èé ñòîë\laba1\curl\include\curl\system.h
|
||||
<ConditionalMacros.h>
|
||||
<inttypes.h>
|
||||
<inttypes.h>
|
||||
<sys/types.h>
|
||||
<sys/socket.h>
|
||||
<sys/poll.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
|
||||
<stdarg.h>
|
||||
<stdio.h>
|
||||
"curl.h"
|
||||
|
||||
1748849797 c:\users\aleks\onedrive\Ðàáî÷èé ñòîë\laba1\curl\include\curl\typecheck-gcc.h
|
||||
|
||||
|
||||
79
main.cpp
79
main.cpp
@@ -3,48 +3,75 @@
|
||||
#include "histogram.h"
|
||||
#include "text.h"
|
||||
#include "svg.h"
|
||||
#include <curl/curl.h>
|
||||
#include <sstream>
|
||||
#include <string>
|
||||
using namespace std;
|
||||
|
||||
|
||||
|
||||
struct Input {
|
||||
std::vector<double> numbers;
|
||||
vector<double> numbers;
|
||||
size_t bin_count;
|
||||
};
|
||||
|
||||
// Ââîä äàííûõ
|
||||
Input input_data() {
|
||||
Input in;
|
||||
Input input_data(istream& in, bool prompt) {
|
||||
Input inp;
|
||||
size_t number_count;
|
||||
cerr << "Enter number count: ";
|
||||
cin >> number_count;
|
||||
|
||||
in.numbers.resize(number_count);
|
||||
|
||||
cerr << "Enter numbers: ";
|
||||
if (prompt){
|
||||
cerr << "Enter number count: ";
|
||||
}
|
||||
in >> number_count;
|
||||
inp.numbers.resize(number_count);
|
||||
if (prompt){
|
||||
cerr << "Enter numbers: ";
|
||||
}
|
||||
for (size_t i = 0; i < number_count; i++) {
|
||||
cin >> in.numbers[i];
|
||||
in >> inp.numbers[i];
|
||||
}
|
||||
|
||||
cerr << "Enter bin count: ";
|
||||
cin >> in.bin_count;
|
||||
|
||||
return in;
|
||||
if (prompt) {
|
||||
cerr << "Enter bin count: ";
|
||||
}
|
||||
in >> inp.bin_count;
|
||||
return inp;
|
||||
}
|
||||
|
||||
// Ïîèñê ìèíèìóìà è ìàêñèìóìà
|
||||
size_t
|
||||
write_data(void* items, size_t item_size, size_t item_count, void* ctx) {
|
||||
stringstream* buffer = reinterpret_cast<stringstream*>(ctx);
|
||||
size_t data_size = item_size * item_count;
|
||||
(*buffer).write(reinterpret_cast<const char*>(items), data_size);
|
||||
return data_size;
|
||||
}
|
||||
|
||||
Input
|
||||
download(const string& adress){
|
||||
stringstream buffer;
|
||||
CURL* curl = curl_easy_init();
|
||||
if(curl) {
|
||||
|
||||
// Ðàñ÷¸ò ãèñòîãðàììû
|
||||
CURLcode res;
|
||||
curl_easy_setopt(curl, CURLOPT_URL, adress.c_str());
|
||||
curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, write_data);
|
||||
curl_easy_setopt(curl, CURLOPT_WRITEDATA, &buffer);
|
||||
res = curl_easy_perform(curl);
|
||||
if (res != CURLE_OK){
|
||||
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) {
|
||||
input = download(argv[1]);
|
||||
} else {
|
||||
input = input_data(cin, true);
|
||||
}
|
||||
|
||||
// Âûâîä ãèñòîãðàììû
|
||||
|
||||
|
||||
// Îñíîâíàÿ ôóíêöèÿ
|
||||
int main() {
|
||||
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);
|
||||
return 0;
|
||||
}
|
||||
|
||||
@@ -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"
|
||||
<vector>
|
||||
|
||||
1748386910 c:\users\aleks\onedrive\Ðàáî÷èé ñòîë\laba1\histogram.h
|
||||
@@ -58,11 +59,11 @@
|
||||
1748392232 c:\users\aleks\onedrive\Ðàáî÷èé ñòîë\laba1\histogram_internal.h
|
||||
<vector>
|
||||
|
||||
1748802937 source:c:\users\aleks\onedrive\Ðàáî÷èé ñòîë\laba1\svg.cpp
|
||||
1748811805 source:c:\users\aleks\onedrive\Ðàáî÷èé ñòîë\laba1\svg.cpp
|
||||
"svg.h"
|
||||
<iostream>
|
||||
|
||||
1748730522 c:\users\aleks\onedrive\Ðàáî÷èé ñòîë\laba1\svg.h
|
||||
1748810901 c:\users\aleks\onedrive\Ðàáî÷èé ñòîë\laba1\svg.h
|
||||
<vector>
|
||||
<cstddef>
|
||||
|
||||
|
||||
Ссылка в новой задаче
Block a user