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

...

3 Коммитов

@ -1,9 +1,13 @@
#include <curl/curl.h>
#include <iostream> #include <iostream>
#include <cmath> #include <cmath>
#include <vector> #include <vector>
#include <sstream>
#include <string>
#include "histogram.h" #include "histogram.h"
#include "text.h" #include "text.h"
#include "svg.h" #include "svg.h"
using namespace std; using namespace std;
@ -12,35 +16,78 @@ 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() input_data(istream& in, bool prompt)
{ {
if(prompt)
cerr << "count=";
size_t number_count;
in >> number_count;
size_t number_count; Input rez;
cerr << "count=";
cin >> number_count;
Input in; if(prompt)
cerr << "numbers= ";
rez.numbers.resize(number_count);
in.numbers.resize(number_count); for (size_t i = 0; i < number_count; i++)
{
for (size_t i = 0; i < number_count; i++) { in >> rez.numbers[i];
cin >> in.numbers[i]; }
if(prompt)
cerr << "bin_count= ";
in >> rez.bin_count;
return rez;
} }
cerr << "bin_count= "; Input
cin >> in.bin_count; download(const string& address) {
stringstream buffer;
CURL* curl = curl_easy_init();
if(curl)
{
CURLcode res;
curl_easy_setopt(curl, CURLOPT_URL, address.c_str());
curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, write_data);
curl_easy_setopt(curl, CURLOPT_WRITEDATA, &buffer);
return in; res = curl_easy_perform(curl);
if (res != 0)
{
cout << 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(input.numbers, input.bin_count);
auto bins = make_histogram(in.numbers, in.bin_count); double ttt=0.0;
show_histogram_svg(bins); show_histogram_svg(bins,ttt);
/* show_histogram_text(bins, in.bin_count);*/ /* show_histogram_text(bins, in.bin_count);*/
return 0; return 0;

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