From d115d0d683684bf5e7a23dd1fbcc49e913800a45 Mon Sep 17 00:00:00 2001 From: TekotovaVA Date: Fri, 26 May 2023 23:17:55 +0300 Subject: [PATCH] =?UTF-8?q?=D0=B4=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5?= =?UTF-8?q?=D0=BD=D0=B0=20=D0=B1=D0=B8=D0=B1=D0=BB=D0=B8=D0=BE=D1=82=D0=B5?= =?UTF-8?q?=D0=BA=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- cs-lab34.cpp | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/cs-lab34.cpp b/cs-lab34.cpp index 361eea4..8744370 100644 --- a/cs-lab34.cpp +++ b/cs-lab34.cpp @@ -1,3 +1,4 @@ +#include #include "text.h" #include "histogram.h" #include "svg.h" @@ -9,21 +10,22 @@ struct Input { vector numbers; size_t bin_count{}; }; -Input input_data() +Input input_data(istream& in) { size_t number_count; - cin >> number_count; - Input in; - in.numbers.resize(number_count); + in >> number_count; + Input k; + k.numbers.resize(number_count); for (size_t i = 0; i < number_count; i++) { - cin >> in.numbers[i]; + in >> k.numbers[i]; } - cin >> in.bin_count; - return in; + in >> k.bin_count; + return k; } int main() { - Input in = input_data(); + curl_global_init(CURL_GLOBAL_ALL); + Input in = input_data(cin); auto ch = make_histogram(in.numbers, in.bin_count); show_histogram_svg(ch); } \ No newline at end of file