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

...

9 Коммитов
main ... double

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

@ -1,3 +1,4 @@
/curl
/bin /bin
/obj /obj
*.layout *.layout

@ -6,46 +6,96 @@
#include "histogram.h" #include "histogram.h"
#include "text.h" #include "text.h"
#include "svg.h" #include "svg.h"
#include <curl/curl.h>
#include <sstream>
#include <string>
using namespace std; using namespace std;
//Ñîçäàíèå ñòðóêòóðû Input äëÿ âõîäíûõ äàííûõ //Ñîçäàíèå ñòðóêòóðû Input äëÿ âõîäíûõ äàííûõ
struct Input { struct Input
{
vector<double> Numbers; vector<double> Numbers;
size_t bin_count{}; size_t bin_count{};
}; };
//Ôóíêöèÿ ââîäà //Ôóíêöèÿ ââîäà
Input input_data(){ Input input_data(istream& in, bool prompt)
{
size_t number_count; size_t number_count;
Input stct; Input stct;
//Ââîä êîëè÷åñòâà ýëåìåíòîâ ìàññèâà //Ââîä êîëè÷åñòâà ýëåìåíòîâ ìàññèâà
if (prompt)
{
cerr << "Enter number count "; cerr << "Enter number count ";
cin >> number_count; }
in >> number_count;
//Ââîä ìàññèâà //Ââîä ìàññèâà
vector<double> Numbers(number_count); vector<double> Numbers(number_count);
stct.Numbers.resize(number_count); stct.Numbers.resize(number_count);
if (prompt)
{
cerr << "Enter array:\n"; cerr << "Enter array:\n";
cin >> stct.Numbers[0]; }
for (int i = 1; i < number_count; i++) { in >> stct.Numbers[0];
cin >> stct.Numbers[i]; for (int i = 1; i < number_count; i++)
{
in >> stct.Numbers[i];
} }
//Ââîä êîëè÷åñòâà êîðçèí //Ââîä êîëè÷åñòâà êîðçèí
if (prompt)
{
cerr << "Enter bin count\n"; cerr << "Enter bin count\n";
cin >> stct.bin_count; }
in >> stct.bin_count;
//Âîçâðàùàåì ñòðóêòóðó //Âîçâðàùàåì ñòðóêòóðó
return stct; return stct;
} }
int main() { size_t
//Ââîä ìàññèâà è êîëè÷åñòâà êîðçèí write_data(void* items, size_t item_size, size_t item_count, void* ctx) {
Input in = input_data(); stringstream* buffer = reinterpret_cast<stringstream*>(ctx);
size_t data_size = item_size * item_count;
//buffer.write(items, data_size);
(*buffer).write(reinterpret_cast<const char*>(items), data_size);
return data_size;
}
//Ñîçäàíèå âåêòîðà bins äëÿ ãèñòîãðàììû Input
vector<size_t> bins = make_histogram(in.Numbers, in.bin_count); download(const string& address)
{
stringstream buffer;
//Âûâîä ãèñòîãðàììû CURL *curl = curl_easy_init();
show_histogram_svg(bins); if(curl)
//show_histogram_text(bins); {
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 0;
res = curl_easy_perform(curl);
if (res != CURLE_OK)
{
cerr << 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);
}
const auto bins = make_histogram(input.Numbers, input.bin_count);
show_histogram_svg(bins);
} }

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