code: переписали ввод и вызов функции ввода данных
Этот коммит содержится в:
26
main.cpp
26
main.cpp
@@ -11,41 +11,35 @@ using namespace std;
|
|||||||
struct Input {
|
struct Input {
|
||||||
vector<double> numbers;
|
vector<double> numbers;
|
||||||
size_t bin_count{};
|
size_t bin_count{};
|
||||||
string colors_stroke;
|
|
||||||
string colors_fill;
|
|
||||||
};
|
};
|
||||||
|
|
||||||
Input
|
Input
|
||||||
input_data(){
|
input_data(istream& in){
|
||||||
|
|
||||||
size_t number_count;
|
size_t number_count;
|
||||||
cerr << "Enter number count: ";
|
cerr << "Enter number count: ";
|
||||||
cin >> number_count;
|
in >> number_count;
|
||||||
|
|
||||||
Input in;
|
Input iinn;
|
||||||
|
|
||||||
in.numbers.resize(number_count);
|
iinn.numbers.resize(number_count);
|
||||||
cerr << "Enter numbers: " << endl;
|
cerr << "Enter numbers: " << endl;
|
||||||
for (size_t i=0; i < number_count; i++)
|
for (size_t i=0; i < number_count; i++)
|
||||||
{
|
{
|
||||||
cin >> in.numbers[i];
|
in >> iinn.numbers[i];
|
||||||
}
|
}
|
||||||
|
|
||||||
cerr << "Enter bin count: ";
|
cerr << "Enter bin count: ";
|
||||||
cin >> in.bin_count;
|
in >> iinn.bin_count;
|
||||||
in.colors_stroke = "midnightblue";
|
|
||||||
in.colors_fill = "deeppink";
|
|
||||||
|
|
||||||
input_colors(in.colors_stroke, in.colors_fill);
|
return iinn;
|
||||||
|
|
||||||
return in;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
int main()
|
int main()
|
||||||
{
|
{
|
||||||
|
|
||||||
auto in = input_data();
|
Input iinn = input_data(cin);
|
||||||
std::vector<size_t> bins = make_histogram(in.numbers, in.bin_count);
|
std::vector<size_t> bins = make_histogram(iinn.numbers, iinn.bin_count);
|
||||||
show_histogram_svg(bins, in.colors_stroke, in.colors_fill);
|
show_histogram_svg(bins);
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|||||||
Ссылка в новой задаче
Block a user