From 0b8d63da09cf99fc2de3777c406019019c27ed3e Mon Sep 17 00:00:00 2001 From: AndrosovDS Date: Mon, 19 May 2025 15:01:00 +0300 Subject: [PATCH] =?UTF-8?q?=D0=BA=D0=BE=D0=BD=D0=B5=D1=86=20=D1=82=D1=80?= =?UTF-8?q?=D0=B5=D1=82=D1=8C=D0=B5=D0=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- main.cpp | 31 ++++++++++++------------------- 1 file changed, 12 insertions(+), 19 deletions(-) diff --git a/main.cpp b/main.cpp index e919aa0..7e40a09 100644 --- a/main.cpp +++ b/main.cpp @@ -1,42 +1,35 @@ #include #include #include "histogram.h" +#include "text.h" #include "svg.h" - using namespace std; -// Структура для хранения входных данных struct Input { vector numbers; - size_t bin_count{}; + size_t bin_count; }; -// Функция ввода данных Input input_data() { Input in; - int number_count; - + size_t number_count; + cerr << "Enter number count: "; cin >> number_count; - while (number_count < 1) { - cin >> number_count; - } - - cin >> in.bin_count; - while (in.bin_count < 1) { - cin >> in.bin_count; - } in.numbers.resize(number_count); - for (int i = 0; i < number_count; i++) { + cerr << "Enter numbers: "; + for (size_t i = 0; i < number_count; i++) { cin >> in.numbers[i]; } + cerr << "Enter bin count: "; + cin >> in.bin_count; return in; } -// Главная функция int main() { - auto in = input_data(); // Ввод данных - auto bins = make_histogram(in.numbers, in.bin_count); // Расчёт гистограммы - show_histogram_svg(bins); // Вывод гистограммы в формате SVG + auto in = input_data(); + auto bins = make_histogram(in.numbers, in.bin_count); + show_histogram_svg(bins); + return 0; }