diff --git a/Histogram/main.cpp b/Histogram/main.cpp index 6ea39b8..1455d88 100644 --- a/Histogram/main.cpp +++ b/Histogram/main.cpp @@ -2,49 +2,33 @@ #include #include "histogram.h" #include "text.h" -#include - struct Input{ std::vector numbers; size_t bin_count{}; }; -Input input_data(std::istream& in, bool prompt) { +Input input_data() { size_t number_count; - if (prompt) { - std::cerr << "Enter number count: "; - } - in >> number_count; + std::cerr << "Enter number count: "; + std::cin >> number_count; - if (prompt) { - std::cerr << "Enter numbers: \n"; - } - Input local; - local.numbers.resize(number_count); + std::cerr << "Enter numbers: \n"; + Input in; + in.numbers.resize(number_count); for (size_t i = 0; i < number_count; ++i) { - in >> local.numbers[i]; - } - if (prompt) { - std::cerr << "Enter bucket: "; + std::cin >> in.numbers[i]; } - in >> local.bin_count; - return local; + std::cerr << "Enter bucket: "; + std::cin >> in.bin_count; + + return in; }; using namespace std; -int main(int argc, char* argv[]) { - if (argc>1){ - std::cout << "Количество аргументов (argc): " << argc << std::endl; - for (int i = 0; i < argc; ++i) { - std::cout << "argv[" << i << "] = " << argv[i] << std::endl; - } - return 0; - } - - curl_global_init(CURL_GLOBAL_ALL); - Input in = input_data(cin, true); +int main() { + Input in = input_data(); auto bins = make_histogram(in.numbers, in.bin_count); show_histogram_svg(bins); return 0;