laba1cb/lab1final/main.cpp

@@ -1,13 +1,9 @@
-#include <curl/curl.h>
 #include <iostream>
 #include <cmath>
 #include <vector>
-#include <sstream>
-#include <string>
 #include "histogram.h"
 #include "text.h"
 #include "svg.h"
-
 using namespace std;
 
 
@@ -16,78 +12,35 @@ struct Input {
     size_t bin_count{};
 };
 
-size_t
-write_data(void* items, size_t item_size, size_t item_count, void* ctx) {
-     size_t data_size = item_size * item_count;
-
-    stringstream* buffer = reinterpret_cast<stringstream*>(ctx);
-    buffer->write(reinterpret_cast<const char*>(items), data_size);
-
-    return data_size;
-}
-
-
 Input
-input_data(istream& in, bool prompt)
+input_data()
 {
-    if(prompt)
+
-        cerr << "count=";
 size_t number_count;
-    in >> number_count;
+cerr << "count=";
+cin >> number_count;
 
-    Input rez;
+Input in;
 
-    if(prompt)
+in.numbers.resize(number_count);
-        cerr << "numbers= ";
-    rez.numbers.resize(number_count);
 
-    for (size_t i = 0; i < number_count; i++)
+for (size_t i = 0; i < number_count; i++) {
-    {
+    cin >> in.numbers[i];
-       in >> rez.numbers[i];
-    }
-    if(prompt)
-        cerr << "bin_count= ";
-    in >> rez.bin_count;
-    return rez;
 }
 
-Input
+cerr << "bin_count= ";
-download(const string& address) {
+cin >> in.bin_count;
-    stringstream buffer;
-
-    CURL* curl = curl_easy_init();
-    if(curl)
-    {
-        CURLcode res;
-         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);
-            exit(1);
-            }
 
-        curl_easy_cleanup(curl);
+return in;
-    }
-    return input_data(buffer, false);
 }
 
-int main(int argc, char* argv[]){
-
-Input input;
-    if (argc > 1) {
-        input = download(argv[1]);
-    } else {
-        input = input_data(cin, true);
-    }
 
+int main()
+{
 
-    auto bins = make_histogram(input.numbers, input.bin_count);
+    auto in = input_data();
-    double ttt=0.0;
+    auto bins = make_histogram(in.numbers, in.bin_count);
-     show_histogram_svg(bins,ttt);
+     show_histogram_svg(bins);
    /* show_histogram_text(bins, in.bin_count);*/
 
     return 0;