From ea43935bf3b792236e99ca70ab000349004bc959 Mon Sep 17 00:00:00 2001 From: Oleg Date: Sat, 9 Sep 2023 12:19:41 +0300 Subject: [PATCH] =?UTF-8?q?=D0=9F=D0=B5=D1=80=D0=B2=D1=8B=D0=B9=20=D0=BA?= =?UTF-8?q?=D0=BE=D0=BC=D0=BC=D0=B8=D1=82=204=20=D0=BB=D0=B0=D0=B1=D1=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 2 ++ main.cpp | 30 +++++++++++++++--------------- 2 files changed, 17 insertions(+), 15 deletions(-) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..4c7473d --- /dev/null +++ b/.gitignore @@ -0,0 +1,2 @@ +/bin +/obj diff --git a/main.cpp b/main.cpp index 4b5778f..cd4ef3f 100644 --- a/main.cpp +++ b/main.cpp @@ -17,28 +17,28 @@ struct Input { }; Input -input_data() { +input_data(istream& in) { size_t number_count; cerr << "Enter number count: "; - cin >> number_count; + in >> number_count; - Input in; - in.numbers.resize(number_count); + Input on; + on.numbers.resize(number_count); for (size_t i = 0; i < number_count; i++) { cerr << "Enter number " << i+1 << ": "; - cin >> in.numbers[i];} + in >> on.numbers[i];} cerr << "Enter bin count: "; - cin >> in.bin_count; + in >> on.bin_count; - in.n = 0; - if (in.bin_count==0){ - in.bin_count = sqrt(number_count); - in.n = 1; - if (in.bin_count > 25){ - in.bin_count = 1 + log2(number_count); - in.n = 2;}} + on.n = 0; + if (on.bin_count==0){ + on.bin_count = sqrt(number_count); + on.n = 1; + if (on.bin_count > 25){ + on.bin_count = 1 + log2(number_count); + on.n = 2;}} - return in; + return on; } @@ -46,7 +46,7 @@ input_data() { int main() { - auto in = input_data(); + auto in = input_data(cin); auto bins = make_histogram(in.numbers, in.bin_count); show_histogram_svg(bins); return 0;