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

...

7 Коммитов

Автор SHA1 Сообщение Дата
LatyshevGI 793740de35 code: final
3 недель назад
LatyshevGI 10793dd568 code: fixes2.0
3 недель назад
LatyshevGI 6138cac446 code: fixes
3 недель назад
LatyshevGI 06677ee183 code: добавлена ссылка
3 недель назад
LatyshevGI 518ab2b6b5 code: добавлен curl
3 недель назад
LatyshevGI dfe74bcb26 code: добавлен bool prompt
3 недель назад
LatyshevGI d0b5fddd35 code; cin изменен на in
3 недель назад

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

@ -2,5 +2,8 @@
/obj /obj
/lab01.depend /lab01.depend
/lab01.layout /lab01.layout
/main.exe
/main.o /main.o
/main.exe
/unittest.layout
/curl
libcurl-x64.dll

@ -33,9 +33,12 @@
<Add option="-fexceptions" /> <Add option="-fexceptions" />
</Compiler> </Compiler>
<Unit filename=".gitignore" /> <Unit filename=".gitignore" />
<Unit filename="Header.cpp" /> <Unit filename="histogram.cpp" />
<Unit filename="Header.h" /> <Unit filename="histogram.h" />
<Unit filename="histogram_internal.h" />
<Unit filename="main.cpp" /> <Unit filename="main.cpp" />
<Unit filename="svg.cpp" />
<Unit filename="svg.h" />
<Unit filename="text.cpp" /> <Unit filename="text.cpp" />
<Unit filename="text.h" /> <Unit filename="text.h" />
<Extensions> <Extensions>

@ -1,3 +1,7 @@
#include <curl/curl.h>
#include <sstream>
#include <string>
#include "histogram.h" #include "histogram.h"
#include "text.h" #include "text.h"
#include "svg.h" #include "svg.h"
@ -6,23 +10,54 @@ struct Input {
vector<double> vec; vector<double> vec;
size_t korz{}; size_t korz{};
}; };
Input input_data() { Input input_data(istream& in, bool prompt = false) {
Input in; Input lin;
size_t n, korz; size_t n, korz;
if(prompt)
cerr << "Number of elements: "; cerr << "Number of elements: ";
cin >> n; in >> n;
in.vec.resize(n); lin.vec.resize(n);
cerr << "Elements: ";
for (size_t i = 0; i < n; i++) for (size_t i = 0; i < n; i++)
cin >> in.vec[i]; in >> lin.vec[i];
cerr << "Enter bin count: "; if(prompt)
cin >> in.korz; cerr << "Enter bin count: ";
return in; in >> lin.korz;
return lin;
}
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 main(int argc, char* argv[]) {
auto in = input_data(); curl_global_init(CURL_GLOBAL_ALL);
auto bins = make_histogram(in.korz, in.vec); 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); show_histogram_svg(bins);
return 0;
} }

@ -31,6 +31,10 @@
<Compiler> <Compiler>
<Add option="-Wall" /> <Add option="-Wall" />
</Compiler> </Compiler>
<Unit filename="doctest.h" />
<Unit filename="histogram.cpp" />
<Unit filename="histogram_internal.h" />
<Unit filename="unittest.cpp" />
<Extensions /> <Extensions />
</Project> </Project>
</CodeBlocks_project_file> </CodeBlocks_project_file>

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