diff --git a/main.cpp b/main.cpp index 0d57581..156b3df 100644 --- a/main.cpp +++ b/main.cpp @@ -1,18 +1,17 @@ #include #include -#include -#include -#include -#include -#include #include #include "histogram.h" +#include "histogram_internal.h" #include "text.h" #include "svg.h" +#include +#include using namespace std; struct Input { + size_t n; vectorA; size_t bin{}; }; @@ -25,23 +24,28 @@ size_t write_data(void* items, size_t item_size, size_t item_count, void* ctx) return data_size; } -Input input_data(istream& tin, bool promt) +Input input_data(istream& tin, bool prompt) { + Input in; size_t n; - if (promt) - cerr<<"Marks: "; - tin>>n; - Input in; - in.A.resize(n); - for (size_t i=0; i>in.n; + in.A.resize(in.n); - if (promt) - cerr<<"Rows: "; + for (size_t i=0; i>in.bin; return in; } @@ -52,31 +56,43 @@ Input download(const string& address) CURL* curl = curl_easy_init(); if(curl) { + CURLcode res; + double connect; 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 != 0) { - cout << curl_easy_strerror(res); + cerr << curl_easy_strerror(res); exit(1); } + else + cerr<<"No errors (code "< 1) in = download(argv[1]); else in = input_data(cin, true); + size_t n; auto B = make_histogram(in.A, in.bin); show_histogram_svg(B); - - system("pause"); return 0; }