diff --git a/lab1.cbp b/lab1.cbp index cfda4fb..a09a318 100644 --- a/lab1.cbp +++ b/lab1.cbp @@ -31,9 +31,12 @@ + + + diff --git a/main.cpp b/main.cpp index 5a4cbe2..3756429 100644 --- a/main.cpp +++ b/main.cpp @@ -4,14 +4,12 @@ #include #include - size_t write_data(void* ptr, size_t size, size_t nmemb, std::stringstream* stream) { size_t data_size = size * nmemb; stream->write(static_cast(ptr), data_size); return data_size; } - Input download(const std::string& url) { std::stringstream buffer; @@ -40,11 +38,9 @@ int main(int argc, char* argv[]) { Input input; if (argc > 1) { - std::cout << "Êîëè÷åñòâî àðãóìåíòîâ: " << argc << std::endl; - for (int i = 0; i < argc; ++i) { - std::cout << "argv[" << i << "] = " << argv[i] << std::endl; - } - return 0; + input = download(argv[1]); + } else { + input = input_data(std::cin, true); } auto bins = make_histogram(input.numbers, input.bin_count);