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

...

2 Коммитов

Автор SHA1 Сообщение Дата
MovsisianRG 1aceeea07c code: added lcurl
11 месяцев назад
MovsisianRG 440d3821db code: new promt
11 месяцев назад

@ -3,7 +3,7 @@
#include "histogram.h" #include "histogram.h"
#include "svg.h" #include "svg.h"
#include "text.h" #include "text.h"
//#include "mycheck.h" #include <curl/curl.h>
using namespace std; using namespace std;
@ -19,53 +19,55 @@ struct Input
}; };
Input Input
input_data(istream& in) input_data(istream& in, bool promt)
{ {
size_t number_count, bin_count, IMAGE_WIDTH; size_t number_count, bin_count, IMAGE_WIDTH;
cerr << "Enter number count: "; if (promt) cerr << "Enter number count: ";
in >> number_count; in >> number_count;
Input n; Input input;
cerr << " Input width of image, > 70 but not >800 : ";
in >> n.IMAGE_WIDTH; if (promt) cerr << " Input width of image, > 70 but not >800 : ";
if(n.IMAGE_WIDTH < 70 || n.IMAGE_WIDTH > 800 ) { in >> input.IMAGE_WIDTH;
while(n.IMAGE_WIDTH < 70 || n.IMAGE_WIDTH > 800) { if(input.IMAGE_WIDTH < 70 || input.IMAGE_WIDTH > 800 ) {
cerr << " Input width of image, >70 but not >800 : "; while(input.IMAGE_WIDTH < 70 || input.IMAGE_WIDTH > 800) {
in >> n.IMAGE_WIDTH; if (promt) cerr << " Input width of image, >70 but not >800 : ";
in >> input.IMAGE_WIDTH;
} }
} }
//size_t number_count = in.number_counts; //size_t number_count = in.number_counts;
n.numbers.resize( number_count ); input.numbers.resize( number_count );
cerr << "Enter numbers: "; if (promt) cerr << "Enter numbers: ";
// vector<double> numbers(number_count); // vector<double> numbers(number_count);
for (size_t i = 0; i < number_count; i++) for (size_t i = 0; i < number_count; i++)
{ {
in >> n.numbers[i]; in >> input.numbers[i];
} }
cerr << "Count of baskets: "; if (promt) cerr << "Count of baskets: ";
in >> n.bin_count; in >> input.bin_count;
return n; return input;
} }
int main() int main()
{ {
curl_global_init(CURL_GLOBAL_ALL);
auto n = input_data(cin); auto input = input_data(cin, true);
auto bins = make_histogram( n.numbers, n.bin_count ); auto bins = make_histogram( input.numbers, input.bin_count );
//int chek_block_width(in.IMAGE_WIDTH); //int chek_block_width(in.IMAGE_WIDTH);
//chek_block_width(in.IMAGE_WIDTH, in.number_count); //chek_block_width(in.IMAGE_WIDTH, in.number_count);
//if (chek_block_width==1) //if (chek_block_width==1)
show_histogram_svg( bins,n.IMAGE_WIDTH ); show_histogram_svg( bins, input.IMAGE_WIDTH );
//if(chek_block_width==0) return 0; //if(chek_block_width==0) return 0;
//show_histogram_svg(bins); //show_histogram_svg(bins);

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