Сравнить коммиты
7 Коммитов
6210fae2ed
...
793740de35
| Автор | SHA1 | Дата | |
|---|---|---|---|
| 793740de35 | |||
| 10793dd568 | |||
| 6138cac446 | |||
| 06677ee183 | |||
| 518ab2b6b5 | |||
| dfe74bcb26 | |||
| d0b5fddd35 |
5
.gitignore
поставляемый
5
.gitignore
поставляемый
@@ -2,5 +2,8 @@
|
||||
/obj
|
||||
/lab01.depend
|
||||
/lab01.layout
|
||||
/main.exe
|
||||
/main.o
|
||||
/main.exe
|
||||
/unittest.layout
|
||||
/curl
|
||||
libcurl-x64.dll
|
||||
|
||||
@@ -33,9 +33,12 @@
|
||||
<Add option="-fexceptions" />
|
||||
</Compiler>
|
||||
<Unit filename=".gitignore" />
|
||||
<Unit filename="Header.cpp" />
|
||||
<Unit filename="Header.h" />
|
||||
<Unit filename="histogram.cpp" />
|
||||
<Unit filename="histogram.h" />
|
||||
<Unit filename="histogram_internal.h" />
|
||||
<Unit filename="main.cpp" />
|
||||
<Unit filename="svg.cpp" />
|
||||
<Unit filename="svg.h" />
|
||||
<Unit filename="text.cpp" />
|
||||
<Unit filename="text.h" />
|
||||
<Extensions>
|
||||
|
||||
65
main.cpp
65
main.cpp
@@ -1,3 +1,7 @@
|
||||
#include <curl/curl.h>
|
||||
|
||||
#include <sstream>
|
||||
#include <string>
|
||||
#include "histogram.h"
|
||||
#include "text.h"
|
||||
#include "svg.h"
|
||||
@@ -6,23 +10,54 @@ struct Input {
|
||||
vector<double> vec;
|
||||
size_t korz{};
|
||||
};
|
||||
Input input_data() {
|
||||
Input in;
|
||||
Input input_data(istream& in, bool prompt = false) {
|
||||
Input lin;
|
||||
size_t n, korz;
|
||||
|
||||
cerr << "Number of elements: ";
|
||||
cin >> n;
|
||||
in.vec.resize(n);
|
||||
cerr << "Elements: ";
|
||||
if(prompt)
|
||||
cerr << "Number of elements: ";
|
||||
in >> n;
|
||||
lin.vec.resize(n);
|
||||
for (size_t i = 0; i < n; i++)
|
||||
cin >> in.vec[i];
|
||||
cerr << "Enter bin count: ";
|
||||
cin >> in.korz;
|
||||
return in;
|
||||
in >> lin.vec[i];
|
||||
if(prompt)
|
||||
cerr << "Enter bin count: ";
|
||||
in >> lin.korz;
|
||||
return lin;
|
||||
}
|
||||
|
||||
int main() {
|
||||
auto in = input_data();
|
||||
auto bins = make_histogram(in.korz, in.vec);
|
||||
show_histogram_svg(bins);
|
||||
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& address){
|
||||
stringstream buffer;
|
||||
CURL* curl = curl_easy_init();
|
||||
if (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);
|
||||
CURLcode res = curl_easy_perform(curl);
|
||||
curl_easy_cleanup(curl);
|
||||
if (res != CURLE_OK) {
|
||||
cerr << "cURL error: " << curl_easy_strerror(res) << endl;
|
||||
exit(1);
|
||||
}
|
||||
return input_data(buffer, false);
|
||||
}
|
||||
}
|
||||
|
||||
int main(int argc, char* argv[]) {
|
||||
curl_global_init(CURL_GLOBAL_ALL);
|
||||
Input input;
|
||||
if (argc > 1) {
|
||||
input = download(argv[1]);
|
||||
}else{
|
||||
input = input_data(cin, true);
|
||||
}
|
||||
auto bins = make_histogram(input.korz, input.vec);
|
||||
show_histogram_svg(bins);
|
||||
return 0;
|
||||
}
|
||||
|
||||
@@ -31,6 +31,10 @@
|
||||
<Compiler>
|
||||
<Add option="-Wall" />
|
||||
</Compiler>
|
||||
<Unit filename="doctest.h" />
|
||||
<Unit filename="histogram.cpp" />
|
||||
<Unit filename="histogram_internal.h" />
|
||||
<Unit filename="unittest.cpp" />
|
||||
<Extensions />
|
||||
</Project>
|
||||
</CodeBlocks_project_file>
|
||||
|
||||
Ссылка в новой задаче
Block a user