main.cpp

@@ -4,7 +4,6 @@
 #include "histogram.h"
 #include "text.h"
 #include "svg.h"
-#include <curl/curl.h>
 using namespace std;
 
 struct Input{
@@ -13,47 +12,30 @@ struct Input{
     };
 
 Input
-input_data(istream& in,bool promt)
+input_data()
 {
-    if (promt){
     size_t count;  // âñå ÷èñëà
     cerr << "Count= ";
     cin >> count;
 
-        Input rez;
+    Input in;
-        rez.numbers.resize(count);
+    in.numbers.resize(count);
     cerr << "numbers:";
     for (size_t i = 0; i < count; i++)
     {
-            cin >> rez.numbers[i];
+        cin >> in.numbers[i];
     }
 
     cerr << "Bin_count= ";
-        cin >> rez.bin_count;
+    cin >> in.bin_count;
-        return rez;
-    }
-    else{
-        size_t count;  // âñå ÷èñëà
-        cin >> count;
 
-        Input rez;
+    return in;
-        rez.numbers.resize(count);
-        for (size_t i = 0; i < count; i++)
-        {
-            cin >> rez.numbers[i];
-        }
-        cin >> rez.bin_count;
-        return rez;
-    }
 }
 
 int main()
 {
-    curl_global_init(CURL_GLOBAL_ALL);
+    Input in = input_data();
-    bool promt=true;
-    Input in = input_data(cin, promt);
     auto bins=make_histogram(in.numbers,in.bin_count);
-    double sr = 0.0;
+    show_histogram_svg(bins); //,in.bin_count);
-    show_histogram_svg(bins,sr);
     return 0;
 }