Сравнить коммиты

..

Ничего общего в коммитах. '40cc4f7fe14afe3358e7b9d7bc3578a9c995ebd7' и '133ecfbbb67c3394f4ae9ab0adc4848e84d5fac4' имеют совершенно разные истории.

1
.gitignore поставляемый

@ -1,3 +1,2 @@
/bin
/obj
/curl

@ -0,0 +1,8 @@
-----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-----

@ -0,0 +1 @@
ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIAMVcWMSwkHQ796Qv12uM1/L9QSqCC1guyCtw8nZgqYa aleks@DESKTOP-3A8L66V

@ -1,11 +1,10 @@
# depslib dependency file v1.0
1748850108 source:c:\users\aleks\onedrive\Ðàáî÷èé ñòîë\laba1\main.cpp
1748812442 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>
@ -79,56 +78,3 @@
"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

@ -3,75 +3,48 @@
#include "histogram.h"
#include "text.h"
#include "svg.h"
#include <curl/curl.h>
#include <sstream>
#include <string>
using namespace std;
struct Input {
vector<double> numbers;
std::vector<double> numbers;
size_t bin_count;
};
Input input_data(istream& in, bool prompt) {
Input inp;
// Ââîä äàííûõ
Input input_data() {
Input in;
size_t number_count;
if (prompt){
cerr << "Enter number count: ";
}
in >> number_count;
inp.numbers.resize(number_count);
if (prompt){
cerr << "Enter numbers: ";
}
cerr << "Enter number count: ";
cin >> number_count;
in.numbers.resize(number_count);
cerr << "Enter numbers: ";
for (size_t i = 0; i < number_count; i++) {
in >> inp.numbers[i];
cin >> in.numbers[i];
}
if (prompt) {
cerr << "Enter bin count: ";
}
in >> inp.bin_count;
return inp;
}
cerr << "Enter bin count: ";
cin >> in.bin_count;
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;
return in;
}
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);
}
// Ðàñ÷¸ò ãèñòîãðàììû
// Âûâîä ãèñòîãðàììû
auto bins = make_histogram(input.numbers, input.bin_count);
// Îñíîâíàÿ ôóíêöèÿ
int main() {
auto in = input_data();
auto bins = make_histogram(in.numbers, in.bin_count);
show_histogram_svg(bins);
return 0;
}

@ -1,7 +1,6 @@
# depslib dependency file v1.0
1748808114 source:c:\users\aleks\onedrive\Ðàáî÷èé ñòîë\laba1\histogram.cpp
1748392121 source:c:\users\aleks\onedrive\Ðàáî÷èé ñòîë\laba1\histogram.cpp
"histogram.h"
"histogram_internal.h"
<vector>
1748386910 c:\users\aleks\onedrive\Ðàáî÷èé ñòîë\laba1\histogram.h
@ -59,11 +58,11 @@
1748392232 c:\users\aleks\onedrive\Ðàáî÷èé ñòîë\laba1\histogram_internal.h
<vector>
1748811805 source:c:\users\aleks\onedrive\Ðàáî÷èé ñòîë\laba1\svg.cpp
1748802937 source:c:\users\aleks\onedrive\Ðàáî÷èé ñòîë\laba1\svg.cpp
"svg.h"
<iostream>
1748810901 c:\users\aleks\onedrive\Ðàáî÷èé ñòîë\laba1\svg.h
1748730522 c:\users\aleks\onedrive\Ðàáî÷èé ñòîë\laba1\svg.h
<vector>
<cstddef>

Загрузка…
Отмена
Сохранить