code: обработка ошибок

.gitignore

@@ -1,3 +1,5 @@
 /bin
 /obj
 /lab1.layout
+/curl
+/lab1.depend

histogram.cpp

@@ -1,6 +1,10 @@
 #include "histogram.h"
 
-void find_minmax(vector<double> vec, double& min, double& max) {
+bool find_minmax(vector<double> vec, double& min, double& max) {
+    if (vec.size() == 0) {
+        cerr << "Empty vec";
+        return false;
+    }
     min = vec[0];
     max = vec[0];
     for (double x : vec) {
@@ -12,8 +16,8 @@ void find_minmax(vector<double> vec, double& min, double& max) {
             max = x;
         }
     }
+    return true;
 }
-
 vector<size_t> make_histogram(size_t number, vector<double> vec) {
     vector<size_t> bins(number);
     double mn, mx;

histogram.h

@@ -2,7 +2,7 @@
 #define HISTOGRAM_H_INCLUDED
 #include <vector>
 #include <iostream>
+
 using namespace std;
 vector<size_t> make_histogram(size_t number, vector<double> vec);
-
 #endif // HISTOGRAM_H_INCLUDED

histogram_internal.h

@@ -1,6 +1,5 @@
 #ifndef HISTOGRAM_INTERNAL_H_INCLUDED
 #define HISTOGRAM_INTERNAL_H_INCLUDED
 
-void find_minmax(std::vector<double> vec, double& min, double& max);
-
+bool find_minmax(std::vector<double> vec, double& min, double& max);
 #endif // HISTOGRAM_INTERNAL_H_INCLUDED

lab1.cbp

@@ -31,8 +31,28 @@
 		<Compiler>
 			<Add option="-Wall" />
 			<Add option="-fexceptions" />
+			<Add directory="C:/Users/Professional/Desktop/cs-lab34/lab1/curl/include" />
 		</Compiler>
+		<Linker>
+			<Add library="C:/Users/Professional/Desktop/cs-lab34/lab1/curl/lib/libcurl.dll.a" />
+			<Add directory="C:/Users/Professional/Desktop/cs-lab34/lab1/curl/lib" />
+		</Linker>
+		<Unit filename="histogram.cpp" />
+		<Unit filename="histogram.h">
+			<Option target="&lt;{~None~}&gt;" />
+		</Unit>
+		<Unit filename="histogram_internal.h">
+			<Option target="&lt;{~None~}&gt;" />
+		</Unit>
 		<Unit filename="main.cpp" />
+		<Unit filename="svg.cpp" />
+		<Unit filename="svg.h">
+			<Option target="&lt;{~None~}&gt;" />
+		</Unit>
+		<Unit filename="text.cpp" />
+		<Unit filename="text.h">
+			<Option target="&lt;{~None~}&gt;" />
+		</Unit>
 		<Extensions>
 			<lib_finder disable_auto="1" />
 		</Extensions>

lab1.depend

@@ -0,0 +1,85 @@
+# depslib dependency file v1.0
+1747403716 source:c:\users\professional\desktop\cs-lab34\lab1\histogram.cpp
+	"histogram.h"
+
+1747403716 c:\users\professional\desktop\cs-lab34\lab1\histogram.h
+	<vector>
+	<iostream>
+
+1747403716 source:c:\users\professional\desktop\cs-lab34\lab1\text.cpp
+	"text.h"
+
+1747403716 c:\users\professional\desktop\cs-lab34\lab1\text.h
+	<iostream>
+	<vector>
+
+1747651892 source:c:\users\professional\desktop\cs-lab34\lab1\main.cpp
+	<curl/curl.h>
+	"histogram.h"
+	"text.h"
+	"svg.h"
+	<iostream>
+	<vector>
+
+1747403716 c:\users\professional\desktop\cs-lab34\lab1\svg.h
+	<iostream>
+	<vector>
+	<string>
+	<math.h>
+
+1747403716 source:c:\users\professional\desktop\cs-lab34\lab1\svg.cpp
+	"svg.h"
+
+1743562062 c:\users\professional\desktop\cs-lab34\lab1\curl\include\curl\curl.h
+	"curlver.h"
+	"system.h"
+	<stdio.h>
+	<limits.h>
+	<sys/param.h>
+	<sys/types.h>
+	<time.h>
+	<winsock2.h>
+	<ws2tcpip.h>
+	<sys/select.h>
+	<sys/socket.h>
+	<sys/time.h>
+	"easy.h"
+	"multi.h"
+	"urlapi.h"
+	"options.h"
+	"header.h"
+	"websockets.h"
+	"mprintf.h"
+	"typecheck-gcc.h"
+
+1743562062 c:\users\professional\desktop\cs-lab34\lab1\curl\include\curl\curlver.h
+
+1743562062 c:\users\professional\desktop\cs-lab34\lab1\curl\include\curl\system.h
+	<ConditionalMacros.h>
+	<inttypes.h>
+	<inttypes.h>
+	<sys/types.h>
+	<sys/socket.h>
+	<sys/poll.h>
+
+1743562062 c:\users\professional\desktop\cs-lab34\lab1\curl\include\curl\easy.h
+
+1743562062 c:\users\professional\desktop\cs-lab34\lab1\curl\include\curl\multi.h
+	"curl.h"
+
+1743562062 c:\users\professional\desktop\cs-lab34\lab1\curl\include\curl\urlapi.h
+	"curl.h"
+
+1743562062 c:\users\professional\desktop\cs-lab34\lab1\curl\include\curl\options.h
+
+1743562062 c:\users\professional\desktop\cs-lab34\lab1\curl\include\curl\header.h
+
+1743562062 c:\users\professional\desktop\cs-lab34\lab1\curl\include\curl\websockets.h
+
+1743562062 c:\users\professional\desktop\cs-lab34\lab1\curl\include\curl\mprintf.h
+	<stdarg.h>
+	<stdio.h>
+	"curl.h"
+
+1743562062 c:\users\professional\desktop\cs-lab34\lab1\curl\include\curl\typecheck-gcc.h
+

main.cpp

@@ -1,159 +1,68 @@
 #include <iostream>
+#include <curl/curl.h>
+#include "histogram.h"
+#include "text.h"
+#include "svg.h"
 #include <vector>
 
 using namespace std;
 
 struct Input {
-    vector<double> numbers;
-    size_t bin_count{};
+    vector<double> vec;
+    size_t korz{};
 };
 
-Input
-input_data() {
-    size_t number_count, bin_count;
-    double minl, maxl, bin_size;
+Input input_data(istream &in, bool prompt) {
+    Input data;
+    size_t n, korz;
 
+    if (prompt) {
+        cerr << "Number of elements: ";
+    }
+    in >> n;
+    data.vec.resize(n);
 
-    cerr << "Enter the number of elements: ";
-    cin >> number_count;
-
-    Input in;
-    in.numbers.resize(number_count);
-
-    vector<double> numbers(number_count);
-
-    cerr << "\nEnter " << number_count << " elements:" << endl;
-    for (size_t i = 0; i < number_count; i++) {
-        cin >> in.numbers[i];
+    if (prompt) {
+        cerr << "Elements: ";
+    }
+    for (size_t i = 0; i < n; i++) {
+        in >> data.vec[i];
     }
 
+    if (prompt) {
+        cerr << "Enter bin count: ";
+    }
+    in >> korz;
+    data.korz = korz;
 
-    cerr << "Enter the number of bins: ";
-    cin >> in.bin_count;
-
-    return in;
+    return data;
 }
 
-void
-find_minmax(const vector<double>& numbers, double& minl, double& maxl) {
-    minl = numbers[0];
-    maxl = numbers[0];
+int main(int argc, char* argv[]) {
+    curl_global_init(CURL_GLOBAL_ALL);
 
-    for (double x : numbers) {
-        if (x < minl) {
-            minl = x;
-        } else {
-            if (x > maxl) {
-                maxl = x;
-            }
-        }
-    }
+    if (argc > 1) {
+        const char *url = argv[1];
+
+        CURL *curl = curl_easy_init();
+        if (curl) {
+            curl_easy_setopt(curl, CURLOPT_URL, url);
+
+            CURLcode res = curl_easy_perform(curl);
+            if (res != CURLE_OK) {
+                cerr << "curl_easy_perform() failed: " << curl_easy_strerror(res) << endl;
+                exit(1);
             }
 
-vector<size_t>
-make_histogram(const vector<double>& numbers, size_t& bin_count) {
-    double minn, maxn;
-    find_minmax(numbers, minn, maxn);
-
-    double bin_size = (maxn - minn) / bin_count;
-
-    vector<size_t> bins(bin_count, 0);
-
-    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 = minn + j * bin_size;
-            auto hi = minn + (j + 1) * bin_size;
-            if ((numbers[i] >= lo) && (numbers[i] <= hi)) {
-                bins[j]++;
-                found = true;
+            curl_easy_cleanup(curl);
         }
-        }
-        if (!found) {
-            bins[bin_count - 1]++;
-        }
-    }
-    return bins;
-}
-
-void
-show_histogram_text(const vector<size_t> bins, size_t bin_count) {
-    size_t max_count = bins[0];
-    for (size_t i = 1; i < bin_count; i++) {
-        if (bins[i] > max_count) {
-            max_count = bins[i];
-        }
-    }
-
-    const size_t SCREEN_WIDTH = 80;
-    const size_t MAX_ASTERISK = SCREEN_WIDTH - 3 - 1;
-
-
-    short space_count;
-
-    cerr << "\nHistogram:" << endl;
-
-    if (max_count <= MAX_ASTERISK) {
-        for (size_t i = 0; i < bin_count; i++) {
-            if (bins[i] < 10) {
-                space_count = 2;
-            } else if (bins[i] >= 10 && bins[i] < 100) {
-                space_count = 1;
-            } else if (bins[i] >= 100 && bins[i] < 1000) {
-                space_count = 0;
-            }
-
-
-
-            for (size_t k = 0; k < space_count; k++) {
-                cout << " ";
-            }
-
-            cout << bins[i];
-
-            cout << "|";
-
-
-            for (size_t j = 0; j < bins[i]; j++) {
-                cout << "*";
-            }
-
-            cout << "\n";
-        }
-    } else {
-        for (size_t i = 0; i < bin_count; i++) {
-            if (bins[i] < 10) {
-                space_count = 2;
-            } else if (bins[i] >= 10 && bins[i] < 100) {
-                space_count = 1;
-            } else if (bins[i] >= 100 && bins[i] < 1000) {
-                space_count = 0;
-            }
-
-
-            for (size_t k = 0; k < space_count; k++) {
-                cout << " ";
-            }
-
-            cout << bins[i];
-
-            cout << "|";
-
-            size_t height = static_cast<size_t>(MAX_ASTERISK * (static_cast<double>(bins[i]) / max_count));
-            for (size_t j = 0; j < height; j++) {
-                cout << "*";
-            }
-
-            cout << "\n";
-        }
-    }
-}
-
-int main() {
-
-    auto in = input_data();
-    auto bins = make_histogram(in.numbers, in.bin_count);
-    show_histogram_text(bins, in.bin_count);
+
+        return 0;
+    }
+
+    auto in_with_prompt = input_data(cin, true);
+    auto bins_with_prompt = make_histogram(in_with_prompt.korz, in_with_prompt.vec);
+    show_histogram_svg(bins_with_prompt);
 
     return 0;
 }

svg.cpp

@@ -0,0 +1,73 @@
+#include "svg.h"
+
+using namespace std;
+
+void
+svg_begin(double width, double height)
+{
+    cout << "<?xml version='1.0' encoding='UTF-8'?>\n";
+    cout << "<svg ";
+    cout << "width='" << width << "' ";
+    cout << "height='" << height << "' ";
+    cout << "viewBox='0 0 " << width << " " << height << "' ";
+    cout << "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>";
+}
+
+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 << "' />";
+
+}
+
+
+
+void
+show_histogram_svg(const vector<size_t>& bins)
+{
+    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 BLOCK_WIDTH = 10;
+    const auto GREEN = "green";
+    const auto RED = "red";
+    const auto MAX_WIDTH = IMAGE_WIDTH - TEXT_WIDTH;
+
+
+    svg_begin(IMAGE_WIDTH,IMAGE_HEIGHT);
+
+    double top = 0;
+    double max_count = bins[0];
+    for (size_t i = 0; i < bins.size(); i++)
+    {
+        if (max_count < bins[i])
+        {
+            max_count = bins[i];
+        }
+    }
+
+    for (size_t bin : bins)
+    {
+        double bin_width = (MAX_WIDTH) * (bin/max_count);
+        svg_text(TEXT_LEFT, top + TEXT_BASELINE, to_string(bin));
+        svg_rect(TEXT_WIDTH, top, bin_width, BIN_HEIGHT, GREEN, RED);
+        top += BIN_HEIGHT;
+    }
+
+    svg_end();
+}

svg.h

@@ -0,0 +1,11 @@
+#ifndef SVG_H_INCLUDED
+#define SVG_H_INCLUDED
+#include <iostream>
+#include <vector>
+#include <string>
+#include <math.h>
+
+using namespace std;
+void show_histogram_svg(const vector<size_t>& bins);
+
+#endif // SVG_H_INCLUDED

text.cpp

@@ -19,7 +19,6 @@ void show_histogram(std::vector<size_t> bins) {
         if (len > spaces) {
             spaces = len;
         }
-
     }
     if (spaces == 1) {
         for (size_t i = 0; i < bins.size(); i++) {

text.h

@@ -3,6 +3,6 @@
 
 #include <iostream>
 #include <vector>
-void show_histogram(std::vector<size_t> bins);
 
+void show_histogram(std::vector<size_t> bins);
 #endif // TEXT_H_INCLUDED

unittest.cbp

@@ -31,6 +31,9 @@
 		<Compiler>
 			<Add option="-Wall" />
 		</Compiler>
+		<Unit filename="histogram.cpp" />
+		<Unit filename="histogram_internal.h" />
+		<Unit filename="unittest.cpp" />
 		<Extensions>
 			<lib_finder disable_auto="1" />
 		</Extensions>

unittest.cpp

@@ -3,6 +3,8 @@
 #include "doctest.h"
 #include "histogram_internal.h"
 
+using namespace std;
+
 TEST_CASE("distinct positive numbers") {
     double min = 0;
     double max = 0;
@@ -10,12 +12,13 @@ TEST_CASE("distinct positive numbers") {
     CHECK(min == 1);
     CHECK(max == 2);
 }
-TEST_CASE("distinct negative numbers"){
+
+TEST_CASE("empty vector"){
     double min = 0;
     double max = 0;
-    find_minmax({-1, -2}, min, max);
-    CHECK(min == -2);
-    CHECK(max == -1);
+    vector<double> empty;
+    bool result = find_minmax(empty, min, max);
+    CHECK(!result);
 }
 TEST_CASE("vector of the same elements"){
     double min = 0;
@@ -53,3 +56,9 @@ TEST_CASE("vector with zero") {
     CHECK(min == -1);
     CHECK(max == 1);
 }
+TEST_CASE("vector with procent"){
+    std::vector<size_t> vec {1,2,1};
+    auto res = make_percentages (vec);
+    CHECK(res[0] == 25);
+
+}

unittest.depend

@@ -1,8 +1,68 @@
 # depslib dependency file v1.0
-1746270053 source:c:\users\professional\desktop\cs-lab34\lab1\histogram.cpp
+1746444035 source:c:\users\professional\desktop\cs-lab34\lab1\histogram.cpp
 	"histogram.h"
+	<cmath>
 
-1746269334 c:\users\professional\desktop\cs-lab34\lab1\histogram.h
+1746443248 c:\users\professional\desktop\cs-lab34\lab1\histogram.h
 	<vector>
 	<iostream>
 
+<<<<<<< HEAD
+1746447653 source:c:\users\professional\desktop\cs-lab34\lab1\unittest.cpp
+=======
+1746274690 source:c:\users\professional\desktop\cs-lab34\lab1\unittest.cpp
+>>>>>>> ccff7aed06ddfe57aff6a2785558e2c335f8cf61
+	"doctest.h"
+	"histogram_internal.h"
+
+1746271199 c:\users\professional\desktop\cs-lab34\lab1\doctest.h
+	<signal.h>
+	<ciso646>
+	<cstddef>
+	<ostream>
+	<istream>
+	<type_traits>
+	"doctest_fwd.h"
+	<ctime>
+	<cmath>
+	<climits>
+	<math.h>
+	<new>
+	<cstdio>
+	<cstdlib>
+	<cstring>
+	<limits>
+	<utility>
+	<fstream>
+	<sstream>
+	<iostream>
+	<algorithm>
+	<iomanip>
+	<vector>
+	<atomic>
+	<mutex>
+	<set>
+	<map>
+	<unordered_set>
+	<exception>
+	<stdexcept>
+	<csignal>
+	<cfloat>
+	<cctype>
+	<cstdint>
+	<string>
+	<sys/types.h>
+	<unistd.h>
+	<sys/sysctl.h>
+	<AfxWin.h>
+	<windows.h>
+	<io.h>
+	<sys/time.h>
+	<unistd.h>
+
+<<<<<<< HEAD
+1746447694 c:\users\professional\desktop\cs-lab34\lab1\histogram_internal.h
+=======
+1746444163 c:\users\professional\desktop\cs-lab34\lab1\histogram_internal.h
+>>>>>>> ccff7aed06ddfe57aff6a2785558e2c335f8cf61
+

unittest.layout

@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
+<CodeBlocks_layout_file>
+	<FileVersion major="1" minor="0" />
+	<ActiveTarget name="Debug" />
+	<File name="unittest.cpp" open="1" top="1" tabpos="1" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+		<Cursor>
+			<Cursor1 position="1494" topLine="36" />
+		</Cursor>
+	</File>
+	<File name="histogram_internal.h" open="0" top="0" tabpos="0" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+		<Cursor>
+			<Cursor1 position="193" topLine="0" />
+		</Cursor>
+	</File>
+</CodeBlocks_layout_file>