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()) {
+
+    if (numbers.size()==0){
+        res = true;
+        return;
+    }
+
     min = numbers[0];
     max = numbers[0];
-    } else {
+    for ( double x : numbers ){
-        min = 0;
+        if ( x < min ){
-        max = 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/lab34.cbp

@@ -32,7 +32,18 @@
 			<Add option="-Wall" />
 			<Add option="-fexceptions" />
 		</Compiler>
+		<Unit filename="histogram.cpp" />
+		<Unit filename="histogram.h" />
+		<Unit filename="histogram_internal.h" />
 		<Unit filename="main.cpp" />
+		<Unit filename="percent.cpp" />
+		<Unit filename="percent.h" />
+		<Unit filename="show_histogram.cpp" />
+		<Unit filename="show_svg.h" />
+		<Unit filename="svg.cpp" />
+		<Unit filename="svg.h" />
+		<Unit filename="text.cpp" />
+		<Unit filename="text.h" />
 		<Extensions>
 			<lib_finder disable_auto="1" />
 		</Extensions>

project/main.cpp

@@ -1,43 +1,94 @@
 #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() {
-    Input in;
-    cerr << "Enter number count: ";
-    cin >> in.number_count;
 
-    vector<double> numbers(in.number_count);
+    size_t number_count;
-    in.numbers.resize(in.number_count);
+    if (prompt) {
-    for (size_t i = 0; i < in.number_count; i++) {
+        cerr << "Enter number count: ";
-        cin >> in.numbers[i];
+    }
+    stream >> number_count;
+
+    Input in;
+    in.numbers.resize(number_count);
+
+
+   if (prompt){
+            cerr << "Enter numbers: ";
+    }
+    for (size_t i = 0; i < number_count; i++)
+    {
+        stream >> in.numbers[i];
     }
 
-    size_t bin_count;
+    if (prompt){
-    cerr << "Enter bin count: ";
+    cerr << "Enter number of bins: ";
-    cin >> in.bin_count;
+    }
+        stream >> in.bin_count;
+
 
-    size_t max_count;
-    in.max_count = 0;
     return in;
 }
 
-int main()
+size_t write_data(void* items, size_t item_size, size_t item_count, void* ctx) {
-{
+    size_t data_size = item_size * item_count;
-    Input in = input_data();
+    stringstream* buffer = reinterpret_cast<stringstream*>(ctx);
-    vector<size_t> bins = make_histogram(in.numbers, in.bin_count, in.number_count, in.max_count);
+    auto text = reinterpret_cast<const char*>(items);
-    show_histogram_svg(bins);
+    buffer->write(text, data_size);
-    return 0;
+    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, 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);
+    }
+{
+    auto bins = make_histogram(in.numbers, in.bin_count);
+
+    show_histogram_svg(bins);
 }

project/show_histogram.cpp

@@ -1,5 +1,5 @@
 #include "svg.h"
-#include "percent.h"
+
 
 void
 show_histogram_svg(const vector<size_t>& bins) {
@@ -29,10 +29,10 @@ show_histogram_svg(const vector<size_t>& bins) {
         }
     }
     for (size_t bin : bins) {
-            const double bin_width = BLOCK_WIDTH * bin;
+            const double bin_width = (IMAGE_WIDTH - TEXT_WIDTH) * (bin) / (longest);
             if (bin == longest){
                 svg_text(TEXT_LEFT, top + TEXT_BASELINE, to_string(bin));
-                svg_rect(TEXT_WIDTH, top, IMAGE_WIDTH - 2*TEXT_WIDTH, BIN_HEIGHT, "#000000", "#ff00a2");
+                svg_rect(TEXT_WIDTH, top, IMAGE_WIDTH - TEXT_WIDTH, BIN_HEIGHT, "#000000", "#ff00a2");
                 top += BIN_HEIGHT;
             } else{
                 svg_text(TEXT_LEFT, top + TEXT_BASELINE, to_string(bin));
@@ -40,11 +40,5 @@ show_histogram_svg(const vector<size_t>& bins) {
                 top += BIN_HEIGHT;
             }
     }
-    top = 0;
-    percent(bins, bins_percent);
-    for (size_t bin_percent : bins_percent){
-            svg_text(IMAGE_WIDTH - TEXT_WIDTH + TEXT_LEFT, top + TEXT_BASELINE, to_string(bin_percent)+"%");
-            top += BIN_HEIGHT;
-    }
     svg_end();
 }

project/unittest.cbp

@@ -33,6 +33,8 @@
 		</Compiler>
 		<Unit filename="histogram.cpp" />
 		<Unit filename="histogram_internal.h" />
+		<Unit filename="percent.cpp" />
+		<Unit filename="percent.h" />
 		<Unit filename="unittest.cpp" />
 		<Extensions>
 			<lib_finder disable_auto="1" />

project/unittest.cpp

@@ -2,7 +2,6 @@
 #define DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN
 #include "doctest.h"
 #include "histogram_internal.h"
-#include "percent.h"
 
 TEST_CASE("distinct empty") {
     double min = 0;
@@ -39,9 +38,3 @@ TEST_CASE("distinct negative numbers") {
     CHECK(min == -4);
     CHECK(max == -1.5);
 }
-TEST_CASE("percent 1") {
-    const vector<size_t>bins{5, 10, 10, 50, 25};
-    vector<size_t>bins_percent{};
-    percent(bins, bins_percent);
-    CHECK(bins_percent[0] == 5);
-}