Сравнить коммиты
2 Коммитов
71cd45931b
...
f46f281b45
| Автор | SHA1 | Дата | |
|---|---|---|---|
| f46f281b45 | |||
| 1dcaabbbd2 |
2
.gitignore
поставляемый
2
.gitignore
поставляемый
@@ -4,3 +4,5 @@ lab03.cbp
|
||||
lab03.depend
|
||||
unittest.depend
|
||||
unittest.cbp
|
||||
/curl
|
||||
lab03.layout
|
||||
|
||||
38
main.cpp
38
main.cpp
@@ -3,6 +3,7 @@
|
||||
#include "histogram.h"
|
||||
#include "svg.h"
|
||||
#include "show_svg.h"
|
||||
#include <curl/curl.h>
|
||||
using namespace std;
|
||||
|
||||
struct Input {
|
||||
@@ -13,31 +14,42 @@ struct Input {
|
||||
};
|
||||
|
||||
Input
|
||||
input_data() {
|
||||
Input in;
|
||||
input_data(istream& stream, bool prompt) {
|
||||
size_t number_count;
|
||||
if (prompt) {
|
||||
cerr << "Enter number count: ";
|
||||
cin >> in.number_count;
|
||||
}
|
||||
stream >> number_count;
|
||||
|
||||
vector<double> numbers(in.number_count);
|
||||
in.numbers.resize(in.number_count);
|
||||
for (size_t i = 0; i < in.number_count; i++) {
|
||||
cin >> in.numbers[i];
|
||||
Input in;
|
||||
in.numbers.resize(number_count);
|
||||
|
||||
|
||||
if (prompt){
|
||||
cerr << "Enter numbers: ";
|
||||
}
|
||||
for (size_t i = 0; i < number_count; i++)
|
||||
{
|
||||
stream >> in.numbers[i];
|
||||
}
|
||||
|
||||
size_t bin_count;
|
||||
cerr << "Enter bin count: ";
|
||||
cin >> in.bin_count;
|
||||
if (prompt){
|
||||
cerr << "Enter number of bins: ";
|
||||
}
|
||||
stream >> in.bin_count;
|
||||
|
||||
|
||||
size_t max_count;
|
||||
in.max_count = 0;
|
||||
return in;
|
||||
}
|
||||
|
||||
int main()
|
||||
{
|
||||
Input in = input_data();
|
||||
curl_global_init(CURL_GLOBAL_ALL);
|
||||
bool prompt = true;
|
||||
auto in = input_data(cin, prompt);
|
||||
vector<size_t> bins = make_histogram(in.numbers, in.bin_count, in.number_count, in.max_count);
|
||||
show_histogram_svg(bins);
|
||||
return 0;
|
||||
|
||||
|
||||
}
|
||||
|
||||
Ссылка в новой задаче
Block a user