histogram.cpp

@@ -3,12 +3,6 @@
 #include "histogram.h"
 
 void find_minmax(const std::vector<double>& numbers, double& min, double& max) {             //  Ïîèñê ìàêñèìóìà è ìèíèìóìà ñðåäè îöåíîê.
-
-    if (numbers.empty()) {
-        min=max=0;
-        return;
-    }
-
     min=numbers[0];
     max=numbers[0];
     for (double x : numbers) {
@@ -25,18 +19,13 @@ void find_minmax(const std::vector<double>& numbers, double& min, double& max) {
 }
 
 std::vector<size_t> make_histogram(const std::vector<double>& numbers, size_t bin_count) {
-    std::vector<size_t> bins(bin_count);
-    if (numbers.empty() || bin_count == 0) {
-        return bins;
-    }
-
     double min, max;
     find_minmax(numbers, min, max);
 
 //  Ñîçäàíèå êîðçèí äëÿ äàëüíåéøåé ñîðòèðîâêè îöåíîê ïî íèì.
 
     double bin_size = (max - min) / bin_count;
-
+    std::vector<size_t> bins(bin_count);
     for (size_t i = 0; i < bin_count; i++) {
         bins[i] = 0;
     }

main.cpp

@@ -40,15 +40,6 @@ input_data(istream& in, bool prompt) {
     return local;
 };
 
-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
 download (const string& address) {
     stringstream buffer;
@@ -56,9 +47,7 @@ download (const string& address) {
 
     if(curl) {
         CURLcode res;
-        curl_easy_setopt(curl, CURLOPT_URL, address.c_str());
+        curl_easy_setopt(curl, CURLOPT_URL, address);
-        curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, write_data);
-        curl_easy_setopt(curl, CURLOPT_WRITEDATA, &buffer);
         res = curl_easy_perform(curl);
 
         if (res != CURLE_OK) {
@@ -72,6 +61,14 @@ download (const string& address) {
     return input_data(buffer, false);
 }
 
+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(static_cast<char*>(items), data_size);
+    return data_size;
+}
+
 int main(int argc, char* argv[]) {
 
     std::string fill = "red";