code: буфер

project/histogram.cpp

@@ -1,50 +1,43 @@
 #include "histogram.h"
 
-vector <size_t>
+vector<size_t> make_histogram(const vector<double> &numbers, size_t bin_count) {
-make_histogram(const vector<double>& numbers, size_t & bin_count, size_t & number_count, size_t & max_count) {
     double min, max;
-    find_minmax(numbers, min, max);
+     bool res = false;
-    double bin_size = (max - min) / bin_count;
+    find_minmax(numbers, min, max, res);
-    vector<size_t> bins(bin_count);
+    double bin_size = ( max - min ) / bin_count;
-    max_count = bins[0];
+    vector<size_t> bins ( bin_count );
-    for (size_t i = 0; i < number_count; i++){
+    for (size_t i=0; i <  numbers.size(); i++ ){
         bool found = false;
-        for (size_t j = 0; (j < bin_count - 1) && !found; j++){
+        for (size_t j = 0; ( j < bin_count - 1 ) && !found; j++ ){
             auto lo = min + j * bin_size;
-            auto hi = min + (j + 1) * bin_size;
+            auto hi = min + ( j + 1 ) * bin_size;
-            if ((lo <= numbers[i]) && (numbers[i] < hi)){
+            if (lo <= numbers[i] && ( numbers[i] < hi )){
                 bins[j]++;
                 found = true;
             }
-            if (bins[j] > max_count){
+            if ( !found ){
-                max_count = bins[j];
+            bins[bin_count-1]++;
-            }
-        }
-        if (!found){
-            bins[bin_count - 1]++;
-        }
-        if (bins[bin_count - 1] > max_count){
-            max_count = bins[bin_count - 1];
         }
     }
     return bins;
 }
 
 void
-find_minmax(const vector<double>& numbers, double& min, double& max) {
+find_minmax(const vector <double> &numbers, double &min, double &max, bool &res) {
-    if (!numbers.empty()) {
+
-        min = numbers[0];
+    if (numbers.size()==0){
-        max = numbers[0];
+        res = true;
-    } else {
+        return;
-        min = 0;
-        max = 0;
     }
-    for (double x : numbers)
+
-    {
+    min = numbers[0];
-        if (x < min){
+    max = numbers[0];
+    for ( double x : numbers ){
+        if ( x < min ){
             min = x;
         }
-        else if (x > max){
+        }
+        else if ( x > max ){
             max = x;
         }
     }

project/histogram.h

@@ -6,9 +6,8 @@
 using namespace std;
 
 vector<size_t>
-make_histogram(const vector<double>& numbers, size_t & bin_count, size_t & number_count, size_t & max_count);
+make_histogram(const std::vector<double>& numbers, size_t bin_count);
 
 void
-find_minmax(const vector<double>& numbers, double& min, double& max);
+find_minmax(const vector <double> &numbers, double &min, double &max, bool &res);
-
 #endif // HISTOGRAM_H_INCLUDED

project/main.cpp

@@ -1,20 +1,22 @@
 #include <iostream>
 #include <vector>
 #include "histogram.h"
+#include "text.h"
 #include "svg.h"
 #include "show_svg.h"
 #include <curl/curl.h>
+#include <sstream>
+#include <string>
+
 using namespace std;
 
 struct Input {
     vector<double> numbers;
     size_t bin_count{};
-    size_t number_count{};
-    size_t max_count{};
 };
 
-Input
+Input input_data(istream& stream, bool prompt) {
-input_data(istream& stream, bool prompt) {
+
     size_t number_count;
     if (prompt) {
         cerr << "Enter number count: ";
@@ -42,28 +44,51 @@ input_data(istream& stream, bool prompt) {
     return in;
 }
 
-int main(int argc, char* argv[])
+size_t write_data(void* items, size_t item_size, size_t item_count, void* ctx) {
-{
+    size_t data_size = item_size * item_count;
-    if (argc > 1) {
+    stringstream* buffer = reinterpret_cast<stringstream*>(ctx);
+    auto text = reinterpret_cast<const char*>(items);
+    buffer->write(text, data_size);
+    return data_size;
+}
+
+Input download(const string& address) {
+
+    stringstream buffer;
+
+    curl_global_init(CURL_GLOBAL_ALL);
+
         CURL* curl = curl_easy_init();
+
         if(curl) {
             CURLcode res;
-            curl_easy_setopt(curl, CURLOPT_URL, argv[1]);
+            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 != CURLE_OK) {
                 curl_easy_strerror(res);
                 exit(1);
             }
             curl_easy_cleanup(curl);
         }
+        return input_data(buffer, false);
+}
+
+
+
+
+int main(int argc, char* argv[]){
+
+    Input in;
+    if (argc > 1) {
+        in = download(argv[1]);
+    } else {
+        in = input_data(cin, true);
     }
 {
-     //curl_global_init(CURL_GLOBAL_ALL);
+    auto bins = make_histogram(in.numbers, in.bin_count);
-    bool prompt = true;
-    auto in = input_data(cin, prompt);
-    vector<size_t> bins = make_histogram(in.numbers, in.bin_count, in.number_count, in.max_count);
-    show_histogram_svg(bins);
-    return 0;
-
 
+    show_histogram_svg(bins);
 }