From 72c1e547fe7c6d7d8dbae3d2ca73f07602bfc52d Mon Sep 17 00:00:00 2001 From: KalenskovaDA Date: Mon, 2 Jun 2025 02:44:58 +0300 Subject: [PATCH] =?UTF-8?q?code:=20=D0=B2=D0=B2=D0=BE=D0=B4=20=D0=B8=D0=B7?= =?UTF-8?q?=20=D0=BF=D1=80=D0=BE=D0=B8=D0=B7=D0=B2=D0=BE=D0=BB=D1=8C=D0=BD?= =?UTF-8?q?=D0=BE=D0=B3=D0=BE=20=D0=BF=D0=BE=D1=82=D0=BE=D0=BA=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- 7112 | 8 -------- 7112.pub | 1 - laba1.depend | 2 +- main.cpp | 39 +++++++++++++++++---------------------- 4 files changed, 18 insertions(+), 32 deletions(-) delete mode 100644 7112 delete mode 100644 7112.pub diff --git a/7112 b/7112 deleted file mode 100644 index fce8b58..0000000 --- a/7112 +++ /dev/null @@ -1,8 +0,0 @@ ------BEGIN OPENSSH PRIVATE KEY----- -b3BlbnNzaC1rZXktdjEAAAAACmFlczI1Ni1jdHIAAAAGYmNyeXB0AAAAGAAAABAqjR8VKL -iXqwsebTTkYzLtAAAAGAAAAAEAAAAzAAAAC3NzaC1lZDI1NTE5AAAAIAMVcWMSwkHQ796Q -v12uM1/L9QSqCC1guyCtw8nZgqYaAAAAoAX6y1g+sl014TmIQ7zX/gv2ngRTEKBcujJq8O -UqkMywAQC10aGheZuBego39vP3S84Tf+kKNzxIUWu+kRpbgi4x2bIc5/kYbYh76DGK+o9z -zCGU6ju3j1fNVHknGYkR0aw2SSu9/Q8GjU+xMd5Rdqj567rbHY/w7Qt8ZYImEKVvYoO/6G -BenNIJk2c3S/lY26lh51GG9DF9PKMrnWNhZIY= ------END OPENSSH PRIVATE KEY----- diff --git a/7112.pub b/7112.pub deleted file mode 100644 index 2db8a5b..0000000 --- a/7112.pub +++ /dev/null @@ -1 +0,0 @@ -ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIAMVcWMSwkHQ796Qv12uM1/L9QSqCC1guyCtw8nZgqYa aleks@DESKTOP-3A8L66V diff --git a/laba1.depend b/laba1.depend index c01c32e..80f48da 100644 --- a/laba1.depend +++ b/laba1.depend @@ -1,5 +1,5 @@ # depslib dependency file v1.0 -1748812442 source:c:\users\aleks\onedrive\Рабочий стол\laba1\main.cpp +1748821392 source:c:\users\aleks\onedrive\Рабочий стол\laba1\main.cpp "histogram.h" diff --git a/main.cpp b/main.cpp index 1eabfad..edbcf55 100644 --- a/main.cpp +++ b/main.cpp @@ -13,38 +13,33 @@ struct Input { }; // Ввод данных -Input input_data() { - Input in; + + +Input input_data(istream& in) { // Убран параметр prompt + Input data; size_t number_count; - cerr << "Enter number count: "; - cin >> number_count; - in.numbers.resize(number_count); + cerr << "Enter the number of elements: "; + in >> number_count; + + data.numbers.resize(number_count); - cerr << "Enter numbers: "; + cerr << "\nEnter " << number_count << " elements:" << endl; for (size_t i = 0; i < number_count; i++) { - cin >> in.numbers[i]; + in >> data.numbers[i]; } - cerr << "Enter bin count: "; - cin >> in.bin_count; + cerr << "Enter the number of bins: "; + in >> data.bin_count; - return in; + return data; } -// Поиск минимума и максимума - - -// Расчёт гистограммы - - -// Вывод гистограммы - - -// Основная функция int main() { - auto in = input_data(); - auto bins = make_histogram(in.numbers, in.bin_count); + Input data = input_data(cin); // Теперь вызывается без параметра prompt + + auto bins = make_histogram(data.numbers, data.bin_count); show_histogram_svg(bins); + return 0; }