main
Александр Чирка 3 недель назад
Родитель 952d1a54bb
Сommit eafadfd62a

@ -31,7 +31,12 @@
<Compiler> <Compiler>
<Add option="-Wall" /> <Add option="-Wall" />
<Add option="-fexceptions" /> <Add option="-fexceptions" />
<Add directory="curl/include" />
</Compiler> </Compiler>
<Linker>
<Add library="curl/lib/libcurl.dll.a" />
<Add directory="curl/lib" />
</Linker>
<Unit filename=".gitignore" /> <Unit filename=".gitignore" />
<Unit filename="histogram.cpp" /> <Unit filename="histogram.cpp" />
<Unit filename="histogram.h" /> <Unit filename="histogram.h" />

@ -15,13 +15,6 @@ struct Input
size_t bin_count{}; 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);
return data_size;
}
Input Input
input_data(istream& in, bool prompt) input_data(istream& in, bool prompt)
{ {
@ -50,6 +43,13 @@ input_data(istream& in, bool prompt)
return cin; return cin;
} }
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);
return data_size;
}
Input Input
download(const string& address) { download(const string& address) {
stringstream buffer; stringstream buffer;
@ -82,15 +82,15 @@ download(const string& address) {
int main(int argc, char* argv[]) int main(int argc, char* argv[])
{ {
CURL* curl = curl_easy_init();
Input input; Input input;
if (argc > 1) { if (argc > 1) {
input = download(argv[1]); input = download(argv[1]);
} else { } else {
input = input_data(cin, true); input = input_data(cin, true);
} }
size_t max_count; auto bins = make_histogram(input.numbers, input.bin_count);
auto in = input_data(cin, true);
auto bins = make_histogram(in.numbers, in.bin_count);
show_histogram_svg(bins); show_histogram_svg(bins);
} }

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