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

...

11 Коммитов

4 изменённых файлов: 7201 добавлений и 72 удалений

1
.gitignore поставляемый
Просмотреть файл

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

7106
doctest.h Обычный файл

Разница между файлами не показана из-за своего большого размера Загрузить разницу

159
main.cpp
Просмотреть файл

@@ -1,97 +1,112 @@
#include <sstream>
#include <string>
#include <curl/curl.h>
#include <iostream> #include <iostream>
#include <vector> #include <vector>
#include "histogram.h"
#include "text.h"
#include "svg.h"
using namespace std; using namespace std;
int main()
{
const size_t SCREEN_WIDTH = 80;
const size_t MAX_ASTERISK = SCREEN_WIDTH - 3-1;
//Êîëè÷åñòâî ÷èñåë
size_t number_count; struct Input {
cerr<<"Enter number count: "; vector<double> numbers;
cin>>number_count; size_t bin_count{};
vector<double>numbers(number_count); size_t number_count{};
size_t max_count{};
};
//×èñëà Input
cerr<<"Enter elements: "; input_data(istream& in, bool prompt) {
for (int i=0; i<number_count;i++){ if (prompt==true){
cin>>numbers[i]; Input input;
cerr << "Enter number count: ";
in >> input.number_count;
vector<double> numbers(input.number_count);
input.numbers.resize(input.number_count);
for (size_t i = 0; i < input.number_count; i++) {
in >> input.numbers[i];
} }
//Êîëè÷åñòâî êîðçèí
size_t bin_count; size_t bin_count;
cerr<<"Enter bins count: "; cerr << "Enter bin count: ";
cin>>bin_count; in >> input.bin_count;
vector<size_t>bins(bin_count);
//Îïðåäåëåíèå äèàïàçîíà ÷èñåë (max è min) â ìàññèâå size_t max_count;
double min=numbers[0]; input.max_count = 0;
double max=numbers[0]; return input;
for (double x: numbers){
if (x<min){
min=x;
}
else if (x>max){
max=x;
}
} }
if (prompt==false){
Input input;
double bin_size=(max-min)/bin_count; in >> input.number_count;
for (size_t i=0; i<number_count; i++){ //Îïîçíîâàíèå è óâåëè÷. ñ÷åò÷èêà ïîñëåäíåé êîðçèíû vector<double> numbers(input.number_count);
bool found =false; input.numbers.resize(input.number_count);
for (size_t j=0; (j<bin_count-1)&&!found; j++){ for (size_t i = 0; i < input.number_count; i++) {
auto lo=min+j*bin_size; in >> input.numbers[i];
auto hi = min+(j+1)*bin_size;
if ((lo<=numbers[i])&&(numbers[i]<hi)){
bins[j]++;
found=true;
}
}
if (!found){
bins[bin_count-1]++;
}
} }
size_t bin_count;
in >> input.bin_count;
//Ìàêñèìàëüíîå êîë-âî çâåçäî÷åê size_t max_count;
int max_simb=0; input.max_count = 0;
for (int i=0; i<bin_count;i++){ return input;
int c=0;
c=bins[i];
if (max_simb<c){
max_simb=c;
}
} }
}
if (max_simb > MAX_ASTERISK){
vector<size_t> hights(bin_count);
for (size_t i = 0; i < bin_count; i++){
size_t height = MAX_ASTERISK * (static_cast<double>(bins[i]) / max_simb);
hights[i] = height;
printf("%3d|", bins[i]);
for (int j=0; j<(hights[i]); j++){
cout<<"*";
}
cout<<endl;
}
} size_t
else{ write_data(void* items, size_t item_size, size_t item_count, void* ctx) {
for (int i=0; i<bin_count; i++){ size_t data_size = item_size * item_count;
printf("%3d|", bins[i]); stringstream* buffer = reinterpret_cast<stringstream*>(ctx);
for (int j=0; j<bins[i]; j++){ buffer->write(reinterpret_cast<const char*>(items), data_size);
cout<<"*"; return data_size;
}
Input
download(const string& address) {
stringstream buffer;
CURL *curl = curl_easy_init();
curl_version_info_data *curl_version_info(CURLversion protocols);
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);
curl_easy_cleanup(curl);
if (res!=0){
cout<<res;
exit(1);
} }
cout<<endl;
curl_version_info_data *ver = curl_version_info(CURLVERSION_NOW);
cerr<<(curl_version_info(CURLVERSION_NOW));
} }
} curl_global_init(CURL_GLOBAL_ALL);
return input_data(buffer, false);
}
int main(int argc, char* argv[])
{
Input in;
if (argc > 1) {
in = download(argv[1]);
}
else {
in = input_data(cin, true);
}
const auto bins = make_histogram(in.numbers, in.bin_count, in.number_count, in.max_count);
vector<double> test;
show_histogram_svg(bins, in.max_count, in.bin_count, test);
return 0; return 0;
} }

Просмотреть файл

@@ -32,7 +32,14 @@
<Add option="-Wall" /> <Add option="-Wall" />
<Add option="-fexceptions" /> <Add option="-fexceptions" />
</Compiler> </Compiler>
<Unit filename="histogram.cpp" />
<Unit filename="histogram.h" />
<Unit filename="histogram_internal.h" />
<Unit filename="main.cpp" /> <Unit filename="main.cpp" />
<Unit filename="svg.cpp" />
<Unit filename="svg.h" />
<Unit filename="text.cpp" />
<Unit filename="text.h" />
<Extensions> <Extensions>
<lib_finder disable_auto="1" /> <lib_finder disable_auto="1" />
</Extensions> </Extensions>