code: добавлен stream
Этот коммит содержится в:
4
.gitignore
поставляемый
4
.gitignore
поставляемый
@@ -1,4 +1,6 @@
|
|||||||
/bin
|
/bin
|
||||||
/obj
|
/obj
|
||||||
/test.layout
|
/*.layout
|
||||||
|
/*.depend
|
||||||
|
/curl
|
||||||
|
|
||||||
|
|||||||
18
main.cpp
18
main.cpp
@@ -14,24 +14,20 @@ struct Input {
|
|||||||
};
|
};
|
||||||
|
|
||||||
Input
|
Input
|
||||||
input_data() {
|
input_data(istream& stream) {
|
||||||
int x, y, z;
|
size_t number_count;
|
||||||
int* p = &x;
|
|
||||||
*p = 1;
|
|
||||||
p = &y;
|
|
||||||
Input in;
|
|
||||||
cerr << "Enter number count: ";
|
cerr << "Enter number count: ";
|
||||||
cin >> in.number_count;
|
stream >> number_count;
|
||||||
|
Input in;
|
||||||
vector<double> numbers(in.number_count);
|
vector<double> numbers(in.number_count);
|
||||||
in.numbers.resize(in.number_count);
|
in.numbers.resize(in.number_count);
|
||||||
for (size_t i = 0; i < in.number_count; i++) {
|
for (size_t i = 0; i < in.number_count; i++) {
|
||||||
cin >> in.numbers[i];
|
stream >> in.numbers[i];
|
||||||
}
|
}
|
||||||
|
|
||||||
size_t bin_count;
|
size_t bin_count;
|
||||||
cerr << "Enter bin count: ";
|
cerr << "Enter bin count: ";
|
||||||
cin >> in.bin_count;
|
stream >> in.bin_count;
|
||||||
|
|
||||||
size_t max_count;
|
size_t max_count;
|
||||||
in.max_count = 0;
|
in.max_count = 0;
|
||||||
@@ -42,7 +38,7 @@ input_data() {
|
|||||||
|
|
||||||
int main()
|
int main()
|
||||||
{
|
{
|
||||||
auto in = input_data();
|
auto in = input_data(cin);
|
||||||
auto bins = make_histogram(in.numbers, in.bin_count, in.number_count, in.max_count);
|
auto bins = make_histogram(in.numbers, in.bin_count, in.number_count, in.max_count);
|
||||||
vector<double> test;
|
vector<double> test;
|
||||||
show_histogram_svg(bins, in.max_count, in.bin_count, test);
|
show_histogram_svg(bins, in.max_count, in.bin_count, test);
|
||||||
|
|||||||
Ссылка в новой задаче
Block a user