From 5c159d3477a4a911e3f7da568d868b40b52bd3bd Mon Sep 17 00:00:00 2001 From: FilippovDY Date: Mon, 20 May 2024 19:07:31 +0300 Subject: [PATCH] =?UTF-8?q?code:=20=D0=B4=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB?= =?UTF-8?q?=D0=B5=D0=BD=20stream?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 4 +++- main.cpp | 18 +++++++----------- 2 files changed, 10 insertions(+), 12 deletions(-) diff --git a/.gitignore b/.gitignore index e4ec23f..5612f2f 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,6 @@ /bin /obj -/test.layout +/*.layout +/*.depend +/curl diff --git a/main.cpp b/main.cpp index 19bf560..442eae3 100644 --- a/main.cpp +++ b/main.cpp @@ -14,24 +14,20 @@ struct Input { }; Input -input_data() { - int x, y, z; - int* p = &x; - *p = 1; - p = &y; - Input in; +input_data(istream& stream) { + size_t number_count; cerr << "Enter number count: "; - cin >> in.number_count; - + stream >> number_count; + Input in; vector numbers(in.number_count); in.numbers.resize(in.number_count); for (size_t i = 0; i < in.number_count; i++) { - cin >> in.numbers[i]; + stream >> in.numbers[i]; } size_t bin_count; cerr << "Enter bin count: "; - cin >> in.bin_count; + stream >> in.bin_count; size_t max_count; in.max_count = 0; @@ -42,7 +38,7 @@ input_data() { 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); vector test; show_histogram_svg(bins, in.max_count, in.bin_count, test);