code: индивидуальный вариант

histogram.cpp

@@ -2,14 +2,20 @@
 #include <conio.h>
 #include <vector>
 #include <stdlib.h>
-using namespace std;
 #include "histogram.h"
 
-void
+using namespace std;
+
+bool
 find_minmax(const vector<double>& numbers, double& min, double& max){
+    if (numbers.empty()){
+        return false;
+    }
+
     min = numbers[0];
-    min = numbers[0];
-    for(size_t i=0; i < numbers.size(); i++){
+    max = numbers[0];
+    for(size_t i=0; i < numbers.size(); i++)
+    {
         if (numbers[i] < min)
         {
             min = numbers[i];
@@ -19,6 +25,8 @@ find_minmax(const vector<double>& numbers, double& min, double& max){
             max = numbers[i];
         }
     }
+
+    return true;
 }
 
 

histogram_internal.h

@@ -0,0 +1,8 @@
+#ifndef HISTOGRAM_INTERNAL_H_INCLUDED
+#define HISTOGRAM_INTERNAL_H_INCLUDED
+
+#include <vector>
+bool
+find_minmax(const std::vector<double>& numbers, double& min, double& max);
+
+#endif // HISTOGRAM_INTERNAL_H_INCLUDED

main.cpp

@@ -1,51 +1,92 @@
-#include <iostream>
-#include <conio.h>
+#include <curl/curl.h>
 #include <vector>
-#include <stdlib.h>
+#include <sstream>
 #include <string>
+#include <iostream>
+#include <string>
+
 #include "histogram.h"
 #include "text.h"
-#include "svg01.h"
+#include "svg.h"
+
 using namespace std;
 
 struct Input {
     vector<double> numbers;
     size_t bin_count {};
-    string colors_stroke;
-    string colors_fill;
 };
 
 Input
-input_data(){
+input_data(istream& in, bool prompt){
 
     size_t number_count;
+    if (prompt){
             cerr << "Enter number count: ";
-    cin >> number_count;
+    }
+    in >> number_count;
 
-    Input in;
-
-    in.numbers.resize(number_count);
-    cerr << "Enter numbers: " << endl;
+    Input iinn;
+    iinn.numbers.resize(number_count);
+    if (prompt){
+            cerr << "Enter numbers: ";}
     for (size_t i = 0; i < number_count; i++)
     {
-        cin >> in.numbers[i];
+        in >> iinn.numbers[i];
     }
 
-    cerr << "Enter bin count: ";
-    cin >> in.bin_count;
-    in.colors_stroke = "midnightblue";
-    in.colors_fill = "deeppink";
+    if (prompt){
+            cerr << "Enter bin count: ";}
+    in >> iinn.bin_count;
 
-    input_colors(in.colors_stroke, in.colors_fill);
-
-    return in;
+    return iinn;
 }
 
-int main()
+static 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;
+    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) {
+                fprintf(stderr, "curl_easy_perform() failed: %s\n", curl_easy_strerror(res));
+                exit(1);
+            }
+            if(!res) {
+                    curl_off_t dl;
+                    res = curl_easy_getinfo(curl, CURLINFO_SIZE_DOWNLOAD_T, &dl);
+                    if(!res) {
+                            cerr<<"Downloaded "<<dl<< " bytes\n";
+                            }
+                    }
+            curl_easy_cleanup(curl);
+        }
+    return input_data(buffer, false);
+}
+
+int
+main(int argc, char* argv[])
 {
-
-    auto in = input_data();
-    std::vector<size_t> bins = make_histogram(in.numbers, in.bin_count);
-    show_histogram_svg(bins, in.colors_stroke, in.colors_fill);
-    return 0;
+    #include <curl/curl.h>
+    curl_global_init(CURL_GLOBAL_ALL);
+    Input input;
+    if (argc > 1) {
+        input = download(argv[1]);
+    } else {
+        input = input_data(cin, true);
+    }
+
+    const auto bins = make_histogram(input.numbers, input.bin_count);
+    show_histogram_svg(bins);
 }

marks.06.txt

@@ -0,0 +1,6 @@
+10
+3 3 4 4 4 4 4 5 5 5
+3
+Yes
+darkgreen
+lightcoral

svg01.cpp

@@ -33,19 +33,19 @@ svg_rect(double x, double y, double width, double height, string colors_stroke,
 void
 input_colors(string &colors_stroke, string &colors_fill){
     string color_personal;
-    cout << "Do you want to change colors? Yes/No" << endl;
+    cerr << "Do you want to change colors? Yes/No" << endl;
     cin >> color_personal;
     while ((color_personal != "No") && (color_personal != "Yes")){
-        cout << "WRONG ANSWER! Try again!" << endl;
+        cerr << "WRONG ANSWER! Try again!" << endl;
         cin >> color_personal;
     }
     if (color_personal == "No"){
         return;
     }
     else {
-        cout << "What color for a stroke do you want?" << endl;
+        cerr << "What color for a stroke do you want?" << endl;
         cin >> colors_stroke;
-        cout << "What color to fill do you want?" << endl;
+        cerr << "What color to fill do you want?" << endl;
         cin >> colors_fill;
     }
     return;

unittest.cpp

@@ -14,9 +14,7 @@ TEST_CASE("distinct positive numbers") {
 TEST_CASE("empty vector"){
     double min = 0;
     double max = 0;
-    find_minmax({ 0, 0 }, min, max);
-    CHECK(min == 0);
-    CHECK(max == 0);
+    CHECK(!find_minmax({}, min, max));
 }
 
 TEST_CASE("same elements"){
@@ -24,7 +22,6 @@ TEST_CASE("same elements"){
     double max = 0;
     find_minmax({ 1, 1 }, min, max);
     CHECK(min == max);
-    CHECK(max == min);
 }
 
 TEST_CASE("only one number"){
@@ -38,7 +35,7 @@ TEST_CASE("only one number"){
 TEST_CASE("distinct negative numbers") {
     double min = 0;
     double max = 0;
-    find_minmax({0, -2}, min, max);
+    find_minmax({-1, -2}, min, max);
     CHECK(min == -2);
-    CHECK(max == 0);
+    CHECK(max == -1);
 }