From 677c96e4ebec332d4e20c09e979dd32154f01e66 Mon Sep 17 00:00:00 2001 From: YaroslavS Date: Sun, 25 May 2025 16:36:43 +0300 Subject: [PATCH] =?UTF-8?q?=20=D0=B4=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5?= =?UTF-8?q?=D0=BD=20=D0=BF=D0=BE=D1=82=D0=BE=D0=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Histogram/main.cpp | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/Histogram/main.cpp b/Histogram/main.cpp index 1455d88..63adcfc 100644 --- a/Histogram/main.cpp +++ b/Histogram/main.cpp @@ -2,33 +2,35 @@ #include #include "histogram.h" #include "text.h" +#include +#include struct Input{ std::vector numbers; size_t bin_count{}; }; -Input input_data() { +Input input_data(std::istream& in) { size_t number_count; std::cerr << "Enter number count: "; - std::cin >> number_count; + in >> number_count; std::cerr << "Enter numbers: \n"; - Input in; - in.numbers.resize(number_count); + Input result; + result.numbers.resize(number_count); for (size_t i = 0; i < number_count; ++i) { - std::cin >> in.numbers[i]; + in >> result.numbers[i]; } std::cerr << "Enter bucket: "; - std::cin >> in.bin_count; + in >> result.bin_count; - return in; + return result; }; using namespace std; int main() { - Input in = input_data(); + Input in = input_data(std::cin); auto bins = make_histogram(in.numbers, in.bin_count); show_histogram_svg(bins); return 0;