Исправление ошибки работы с ссылками

.gitignore

@@ -1,4 +1,4 @@
-
+curl/
 bin/
 obj/
 *.cbp

histogram.cpp

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

histogram.h

@@ -0,0 +1,9 @@
+#ifndef HISTOGRAM_H_INCLUDED
+#define HISTOGRAM_H_INCLUDED
+
+#include <vector>
+using namespace std;
+
+vector<size_t> make_histogram(vector<double> numbers, size_t bin_count);
+
+#endif

histogram_internal.h

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

lab01.cbp

@@ -32,7 +32,14 @@
 			<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="svg.cpp" />
+		<Unit filename="svg.h" />
+		<Unit filename="text.cpp" />
+		<Unit filename="text.h" />
 		<Extensions>
 			<lib_finder disable_auto="1" />
 		</Extensions>

main.cpp

@@ -1,122 +1,78 @@
 #include <iostream>
 #include <vector>
-
+#include "histogram.h"
+#include "text.h"
+#include "svg.h"
+#include <curl/curl.h>
+#include <sstream>
+#include <string>
 using namespace std;
 
 struct Input {
     vector<double> numbers;
-    size_t bin_count{};
+    size_t bin_count;
 };
 
-Input input_data(){
-    size_t number_count, bin_count;
+Input input_data(istream& in, bool prompt) {
+    Input inp;
+    size_t number_count;
+    if (prompt){
         cerr << "Enter number count: ";
-    cin >> number_count;
-    Input in;
-    in.numbers.resize(number_count);
-
-    for (size_t i = 0; i < number_count; i++)
-    {
-        cerr << "Enter Num[" << i << "]: ";
-        cin >> in.numbers[i];
     }
+    in >> number_count;
+    inp.numbers.resize(number_count);
+    if (prompt){
+                cerr << "Enter numbers: ";
+        }
+    for (size_t i = 0; i < number_count; i++) {
+        in >> inp.numbers[i];
+    }
+
+    if (prompt) {
             cerr << "Enter bin count: ";
-    cin >> in.bin_count;
-    return in;
+    }
+    in >> inp.bin_count;
+    return inp;
 }
 
-void find_minmax(const vector<double> &numbers, double &min, double &max)
-{
-    max = numbers[0];
-    min = numbers[1];
-    for (double x: numbers)
-    {
-        if (x < min)
-        {
-            min = x;
-        }
-        else if (x > max)
-        {
-            max = x;
-        }
-    }
-    return;
+size_t
+write_data(void* items, size_t item_size, size_t item_count, void* ctx) {
+    stringstream* buffer = reinterpret_cast<stringstream*>(ctx);
+    size_t data_size = item_size * item_count;
+    (*buffer).write(reinterpret_cast<const char*>(items), data_size);
+    return data_size;
 }
 
-vector<size_t> make_histogram (vector<double> numbers, size_t bin_count)
-{
-    double min, max;
-    find_minmax (numbers, min, max);
-    double bin_size = (max - min) / bin_count;
-    vector<size_t> bins(bin_count);
-    for (size_t i = 0; i < numbers.size(); i++)
-    {
-        bool found = false;
-        for (size_t j = 0; (j < bin_count - 1) && !found; j++)
-        {
-            auto lo = min + j * bin_size;
-            auto hi = min + (j + 1) * bin_size;
-            if ((lo <= numbers[i]) && (numbers[i] < hi))
-            {
-                bins[j]++;
-                found = true;
+Input
+download(const string& adress){
+    stringstream buffer;
+    CURL* curl = curl_easy_init();
+    if(curl) {
+
+        CURLcode res;
+        curl_easy_setopt(curl, CURLOPT_URL, adress.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){
+            cerr << curl_easy_strerror(res);
+            exit(1);
         }
+        curl_easy_cleanup(curl);
     }
-        if (!found)
-        {
-            bins[bin_count - 1]++;
-        }
-    }
-    return bins;
+
+    return input_data(buffer, false);
 }
-
-void show_histogram_text(vector<size_t> bins, size_t bin_count)
-{
-    const size_t SCREEN_WIDTH = 80;
-    const size_t MAX_ASTERISK = SCREEN_WIDTH - 3 - 1;
-    double max_bin;
-    size_t height;
-    max_bin = bins[0];
-    height = bins[0];
-    for (size_t i = 0; i < bin_count; i++)
-    {
-        if (bins[i] > max_bin){
-            max_bin = bins[i];
-        }
+int main(int argc, char* argv[]) {
+    Input input;
+    if (argc > 1) {
+        input = download(argv[1]);
+    } else {
+        input = input_data(cin, true);
     }
 
-    bool flag = false;
-    if ( max_bin > 80)
-    {
-        flag = true;
-    }
-    for (size_t i = 0; i < bin_count; i++)
-    {
-        if (bins[i] < 100)
-            cout << " ";
-        if (bins[i] < 10)
-            cout << " ";
-        cout << bins[i] << "|";
-        if( flag == true)
-        {
-            height = MAX_ASTERISK * (static_cast<double>(bins[i]) / max_bin);
-        }
-        else
-        {
-            height = bins[i];
-        }
-        for (size_t j = 0; j < height; j++)
-        {
-            cout << "*";
-        }
-        cout << endl;
-    }
-}
-
-int main()
-{
-    auto in = input_data();
-    auto bins = make_histogram(in.numbers, in.bin_count);
-    show_histogram_text(bins, in.bin_count);
+    auto bins = make_histogram(input.numbers, input.bin_count);
+    show_histogram_svg(bins);
     return 0;
 }
+

marks.txt

@@ -0,0 +1,3 @@
+10
+3 3 4 4 4 4 4 5 5 5
+3

svg.cpp

@@ -0,0 +1,62 @@
+#include <iostream>
+#include <vector>
+#include <string>
+#include "svg.h"
+
+using namespace std;
+
+void svg_begin(double width, double height) {
+    cout << "<?xml version='1.0' encoding='UTF-8'?>\n";
+    cout << "<svg "
+         << "width='" << width << "' "
+         << "height='" << height << "' "
+         << "viewBox='0 0 " << width << " " << height << "' "
+         << "xmlns='http://www.w3.org/2000/svg'>\n";
+}
+
+void svg_end() {
+    cout << "</svg>\n";
+}
+
+void svg_text(double left, double baseline, string text) {
+    cout << "<text x='" << left << "' y='" << baseline << "'>" << text << "</text>\n";
+}
+
+void svg_rect(double x, double y, double width, double height, string stroke = "black", string fill = "black") {
+    cout << "<rect x='" << x << "' y='" << y << "' width='" << width << "' height='" << height
+         << "' stroke='" << stroke << "' fill='" << fill << "' />\n";
+}
+
+void show_histogram_svg(const vector<size_t>& bins) {
+    if (bins.empty()) {
+        cerr << "Error: Empty bins vector\n";
+        return;
+    }
+
+    const auto IMAGE_WIDTH = 400;
+    const auto IMAGE_HEIGHT = 300;
+    const auto TEXT_LEFT = 20;
+    const auto TEXT_BASELINE = 20;
+    const auto TEXT_WIDTH = 50;
+    const auto BIN_HEIGHT = 30;
+    const auto MAX_WIDTH = IMAGE_WIDTH - TEXT_WIDTH;
+
+    svg_begin(IMAGE_WIDTH, IMAGE_HEIGHT);
+
+    double top = 0;
+    size_t max_count = bins[0];
+    for (size_t bin : bins) {
+        if (max_count < bin) {
+            max_count = bin;
+        }
+    }
+
+    for (size_t bin : bins) {
+        const double bin_width = MAX_WIDTH * (static_cast<double>(bin) / max_count);
+        svg_text(TEXT_LEFT, top + TEXT_BASELINE, to_string(bin));
+        svg_rect(TEXT_WIDTH, top, bin_width, BIN_HEIGHT, "black", "red");
+        top += BIN_HEIGHT;
+    }
+
+    svg_end();
+}

svg.h

@@ -0,0 +1,9 @@
+#ifndef SVG_H_INCLUDED
+#define SVG_H_INCLUDED
+
+#include <vector>
+#include <cstddef> // Äëÿ size_t
+
+void show_histogram_svg(const std::vector<size_t>& bins);
+
+#endif // SVG_H_INCLUDED

text.cpp

@@ -0,0 +1,37 @@
+#include "text.h"
+#include <iostream>
+using namespace std;
+
+void show_histogram_text(vector<size_t> bins, size_t bin_count) {
+    const size_t SCREEN_WIDTH = 80;
+    const size_t MAX_ASTERISK = SCREEN_WIDTH - 3 - 1;
+    double max_bin;
+    size_t height;
+    max_bin = bins[0];
+    height = bins[0];
+    for (size_t i = 0; i < bin_count; i++) {
+        if (bins[i] > max_bin) {
+            max_bin = bins[i];
+        }
+    }
+
+    bool flag = false;
+    if (max_bin > 80) {
+        flag = true;
+    }
+    for (size_t i = 0; i < bin_count; i++) {
+        if (bins[i] < 100) cout << " ";
+        if (bins[i] < 10) cout << " ";
+        cout << bins[i] << "|";
+        if (flag == true) {
+            height = MAX_ASTERISK * (static_cast<double>(bins[i]) / max_bin);
+        }
+        else {
+            height = bins[i];
+        }
+        for (size_t j = 0; j < height; j++) {
+            cout << "*";
+        }
+        cout << endl;
+    }
+}

text.h

@@ -0,0 +1,9 @@
+#ifndef TEXT_H_INCLUDED
+#define TEXT_H_INCLUDED
+
+#include <vector>
+using namespace std;
+
+void show_histogram_text(vector<size_t> bins, size_t bin_count);
+
+#endif

unittest.cpp

@@ -0,0 +1,44 @@
+#define DOCTEST_CONFIG_NO_MULTITHREADING
+#define DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN
+#include "doctest.h"
+#include "histogram_internal.h"
+
+TEST_CASE("distinct positive numbers") {
+    double min = 0;
+    double max = 0;
+    find_minmax({1, 2}, min, max);
+    CHECK(min == 1);
+    CHECK(max == 2);
+}
+
+
+TEST_CASE("distinct negative numbers"){
+    double min = 0;
+    double max = 0;
+    find_minmax({-1, -2}, min, max);
+    CHECK(min == -2);
+    CHECK(max == -1);
+}
+TEST_CASE("vector of the same elements"){
+    double min = 0;
+    double max = 0;
+    find_minmax({3,3,3}, min, max);
+    CHECK(min == 3);
+    CHECK(max == 3);
+}
+
+TEST_CASE("single element vector") {
+    double min = 0;
+    double max = 0;
+    find_minmax({7}, min, max);
+    CHECK(min == 7);
+    CHECK(max == 7);
+}
+
+TEST_CASE("empty vector") {
+    double min = 0;
+    double max = 0;
+    find_minmax({}, min, max);
+    CHECK(min == 0);
+    CHECK(max == 0);
+}