From 803efea28bf9f64b063d466659194839327e2885 Mon Sep 17 00:00:00 2001
From: MachulinaDV <MachulinaDV>
Date: Sun, 4 Jun 2023 14:56:27 +0300
Subject: [PATCH] =?UTF-8?q?code:=20=D0=B8=D0=BD=D0=B4=D0=B8=D0=B2=D0=B8?=
 =?UTF-8?q?=D0=B4=D1=83=D0=B0=D0=BB=D1=8C=D0=BD=D0=BE=D0=B5=20=D0=B7=D0=B0?=
 =?UTF-8?q?=D0=B4=D0=B0=D0=BD=D0=B8=D0=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 main.cpp | 58 ++++++++++++++++++++++++++++++++++++--------------------
 1 file changed, 37 insertions(+), 21 deletions(-)

diff --git a/main.cpp b/main.cpp
index 0d57581..156b3df 100644
--- a/main.cpp
+++ b/main.cpp
@@ -1,18 +1,17 @@
 #include <iostream>
 #include <vector>
-#include <math.h>
-#include <sstream>
-#include <string>
-#include <stdlib.h>
-#include <stdio.h>
 #include <curl/curl.h>
 #include "histogram.h"
+#include "histogram_internal.h"
 #include "text.h"
 #include "svg.h"
+#include <sstream>
+#include <string>
 
 using namespace std;
 
     struct Input {
+    size_t n;
     vector<double>A;
     size_t bin{};
     };
@@ -25,23 +24,28 @@ size_t write_data(void* items, size_t item_size, size_t item_count, void* ctx)
     return data_size;
 }
 
-Input input_data(istream& tin, bool promt)
+Input input_data(istream& tin, bool prompt)
 {
+    Input in;
     size_t n;
-    if (promt)
-    cerr<<"Marks: ";
-    tin>>n;
 
-    Input in;
-    in.A.resize(n);
-     for (size_t i=0; i<n; i++)
+    if (prompt)
     {
-        cerr<<"A["<<i<<"]=";
-        cin>>in.A[i];
+        cout<<"Marks: ";
     }
+    tin>>in.n;
+    in.A.resize(in.n);
 
-    if (promt)
-    cerr<<"Rows: ";
+    for (size_t i=0; i<in.n; i++)
+    {
+        cout<<"A["<<i<<"]=";
+        tin>>in.A[i];
+    }
+
+    if (prompt)
+    {
+       cout<<"Rows: ";
+    }
     tin>>in.bin;
     return in;
 }
@@ -52,31 +56,43 @@ Input download(const string& address)
     CURL* curl = curl_easy_init();
     if(curl)
     {
+
         CURLcode res;
+        double connect;
         curl_easy_setopt(curl, CURLOPT_URL, address.c_str());
+        curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, write_data);
         curl_easy_setopt(curl, CURLOPT_WRITEDATA, &buffer);
         res = curl_easy_perform(curl);
         if (res != 0)
         {
-            cout << curl_easy_strerror(res);
+            cerr << curl_easy_strerror(res);
             exit(1);
         }
+        else
+            cerr<<"No errors (code "<<res<<")"<<'\n';
+        if(CURLE_OK == res)
+        {
+            res = curl_easy_getinfo(curl, CURLINFO_CONNECT_TIME, &connect);
+            if(CURLE_OK == res)
+            {
+                cerr<<"Connecting time: "<<connect<<"sec";
+            }
+        }
+        curl_easy_cleanup(curl);
     }
-    curl_easy_cleanup(curl);
-    curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, write_data);
     return input_data(buffer, false);
 }
 
 int main(int argc, char* argv[])
 {
     Input in;
+    CURLcode res;
     if (argc > 1)
         in = download(argv[1]);
     else
         in = input_data(cin, true);
+    size_t n;
     auto B = make_histogram(in.A, in.bin);
     show_histogram_svg(B);
-
-    system("pause");
     return 0;
 }