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

...

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; {
size_t bin_count{}; vector<double> Numbers;
}; 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;
//Ââîä êîëè÷åñòâà ýëåìåíòîâ ìàññèâà //Ââîä êîëè÷åñòâà ýëåìåíòîâ ìàññèâà
cerr << "Enter number count "; if (prompt)
cin >> number_count; {
cerr << "Enter 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);
cerr << "Enter array:\n"; if (prompt)
cin >> stct.Numbers[0]; {
for (int i = 1; i < number_count; i++) { cerr << "Enter array:\n";
cin >> stct.Numbers[i]; }
} in >> stct.Numbers[0];
//Ââîä êîëè÷åñòâà êîðçèí for (int i = 1; i < number_count; i++)
cerr << "Enter bin count\n"; {
cin >> stct.bin_count; in >> stct.Numbers[i];
//Âîçâðàùàåì ñòðóêòóðó }
return stct; //Ââîä êîëè÷åñòâà êîðçèí
if (prompt)
{
cerr << "Enter bin count\n";
}
in >> stct.bin_count;
//Âîçâðàùàåì ñòðóêòóðó
return stct;
}
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(items, data_size);
(*buffer).write(reinterpret_cast<const char*>(items), data_size);
return data_size;
} }
int main() { Input
//Ââîä ìàññèâà è êîëè÷åñòâà êîðçèí download(const string& address)
Input in = input_data(); {
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);
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);
}
//Ñîçäàíèå âåêòîðà bins äëÿ ãèñòîãðàììû
vector<size_t> bins = make_histogram(in.Numbers, in.bin_count);
//Âûâîä ãèñòîãðàììû int
show_histogram_svg(bins); main(int argc, char* argv[]) {
//show_histogram_text(bins); Input input;
if (argc > 1) {
input = download(argv[1]);
} else {
input = input_data(cin, true);
}
return 0; const auto bins = make_histogram(input.Numbers, input.bin_count);
show_histogram_svg(bins);
} }

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