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

...

5 Коммитов

@ -4,73 +4,113 @@
#include "svg.h" #include "svg.h"
#include "text.h" #include "text.h"
#include <curl/curl.h> #include <curl/curl.h>
#include <sstream>
#include <string>
using namespace std; using namespace std;
//const size_t SCREEN_WIDTH = 80;
//const size_t MAX_ASTERISK = SCREEN_WIDTH - 3 - 1;
struct Input struct Input
{ {
vector<double> numbers; vector<double> numbers;
size_t bin_count{}; size_t bin_count{};
size_t IMAGE_WIDTH{};
}; };
Input Input input_data(istream &in, bool promt)
input_data(istream& in, bool promt)
{ {
size_t number_count, bin_count, IMAGE_WIDTH; size_t number_count, bin_count;
if (promt) cerr << "Enter number count: "; if (promt)
{
cerr << "Enter number count: ";
}
in >> number_count; in >> number_count;
Input input; Input input;
input.numbers.resize(number_count);
if (promt)
if (promt) cerr << " Input width of image, > 70 but not >800 : "; {
in >> input.IMAGE_WIDTH; cerr << "Enter numbers: ";
if(input.IMAGE_WIDTH < 70 || input.IMAGE_WIDTH > 800 ) {
while(input.IMAGE_WIDTH < 70 || input.IMAGE_WIDTH > 800) {
if (promt) cerr << " Input width of image, >70 but not >800 : ";
in >> input.IMAGE_WIDTH;
}
} }
//size_t number_count = in.number_counts;
input.numbers.resize( number_count );
if (promt) cerr << "Enter numbers: ";
// vector<double> numbers(number_count);
for (size_t i = 0; i < number_count; i++) for (size_t i = 0; i < number_count; i++)
{ {
in >> input.numbers[i]; in >> input.numbers[i];
} }
if (promt) cerr << "Count of baskets: "; if (promt)
{
cerr << "Count of baskets: ";
}
in >> input.bin_count; in >> input.bin_count;
return input; return input;
} }
size_t
write_data(void *items, size_t item_size, size_t item_count, void *ctx)
{
size_t data_size = item_count * item_size;
stringstream *buffer = reinterpret_cast<stringstream *>(ctx);
char *item = reinterpret_cast<char *>(items);
//(*buffer).write(item, data_size);
buffer->write(item, data_size);
return data_size;
}
int main() Input download(const string &address)
{ {
stringstream buffer;
// address.c_str();
curl_global_init(CURL_GLOBAL_ALL); curl_global_init(CURL_GLOBAL_ALL);
{
CURL *curl = curl_easy_init();
if (curl)
{
CURLcode res;
double total;
curl_easy_setopt(curl, CURLOPT_URL, address.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)
{
fprintf(stderr, "curl_easy_perform() failed: %s\n",
curl_easy_strerror(res));
exit(1);
}
if (CURLE_OK == res)
{
res = curl_easy_getinfo(curl, CURLINFO_TOTAL_TIME, &total);
cerr << "Time spending for downloading file: " << total << endl;
}
curl_easy_cleanup(curl);
}
}
auto input = input_data(cin, true); return input_data(buffer, false);
auto bins = make_histogram( input.numbers, input.bin_count ); }
//int chek_block_width(in.IMAGE_WIDTH);
//chek_block_width(in.IMAGE_WIDTH, in.number_count); int main(int argc, char *argv[])
//if (chek_block_width==1) {
show_histogram_svg( bins, input.IMAGE_WIDTH ); Input input;
//if(chek_block_width==0) return 0; if (argc > 1)
//show_histogram_svg(bins); {
input = download(argv[1]);
}
else
{
input = input_data(cin, true);
}
const auto bins = make_histogram(input.numbers, input.bin_count);
show_histogram_svg(bins);
} }
Загрузка…
Отмена
Сохранить