code: защита

cs-lab34.cbp

@@ -32,7 +32,15 @@
 			<Add option="-Wall" />
 			<Add option="-fexceptions" />
 		</Compiler>
+		<Unit filename=".gitignore" />
+		<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>

histogram.h

@@ -3,3 +3,4 @@
 
 using namespace std;
 vector<size_t> make_histogram(size_t number, vector<double> vec);
+

main.cpp

@@ -5,24 +5,40 @@
 struct Input {
     vector<double> vec;
     size_t korz{};
+    size_t block_width{};
 };
+
 Input input_data() {
     Input in;
     size_t n, korz;
 
-    cerr << "Enter the number of elements: ";
+    cerr << "Number of elements: ";
     cin >> n;
     in.vec.resize(n);
-    cerr << "Enter elements: ";
+    cerr << "Elements: ";
     for (size_t i = 0; i < n; i++)
         cin >> in.vec[i];
     cerr << "Enter bin count: ";
     cin >> in.korz;
+
+
+    cerr << "Enter block width in px (3-30): ";
+    cin >> in.block_width;
+
+    while (in.block_width < 3 || in.block_width > 30) {
+        if (in.block_width < 3) {
+            cerr << "Block width too small! Minimum is 3px. Please enter again: ";
+        } else {
+            cerr << "Block width too large! Maximum is 30px. Please enter again: ";
+        }
+        cin >> in.block_width;
+    }
+
     return in;
 }
 
 int main() {
     auto in = input_data();
     auto bins = make_histogram(in.korz, in.vec);
-    show_histogram_svg(bins);
+    show_histogram_svg(bins, in.block_width);
 }

svg.cpp

@@ -2,9 +2,7 @@
 
 using namespace std;
 
-void
+void svg_begin(double width, double height) {
-svg_begin(double width, double height)
-{
     cout << "<?xml version='1.0' encoding='UTF-8'?>\n";
     cout << "<svg ";
     cout << "width='" << width << "' ";
@@ -13,59 +11,46 @@ svg_begin(double width, double height)
     cout << "xmlns='http://www.w3.org/2000/svg'>\n";
 }
 
-void
+void svg_end() {
-svg_end()
-{
     cout << "</svg>\n";
 }
 
-void
+void svg_text(double left, double baseline, string text) {
-svg_text(double left, double baseline, string text)
-{
     cout << "<text x='" << left << "' y='" << baseline << "'>" << text << "</text>";
 }
 
-void
+void svg_rect(double x, double y, double width, double height, string stroke, string fill) {
-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, size_t block_width) {
-
-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 BLACK = "black";
-    const auto PURPLE = "purple";
+    const auto RED = "red";
     const auto MAX_WIDTH = IMAGE_WIDTH - TEXT_WIDTH;
 
-
+    svg_begin(IMAGE_WIDTH, IMAGE_HEIGHT);
-    svg_begin(IMAGE_WIDTH,IMAGE_HEIGHT);
 
     double top = 0;
-    double max_count = bins[0];
+    double max_count = bins.empty() ? 0 : bins[0];
-    for (size_t i = 0; i < bins.size(); i++)
+    for (size_t i = 1; i < bins.size(); i++) {
-    {
+        if (bins[i] > max_count) {
-        if (max_count < bins[i])
-        {
             max_count = bins[i];
         }
     }
 
-    for (size_t bin : bins)
+    for (size_t bin : bins) {
-    {
+        double bin_width = static_cast<double>(block_width) * bin;
-        double bin_width = (MAX_WIDTH) * (bin/max_count);
+        if (bin_width > MAX_WIDTH) {
+            bin_width = MAX_WIDTH;
+        }
         svg_text(TEXT_LEFT, top + TEXT_BASELINE, to_string(bin));
-        svg_rect(TEXT_WIDTH, top, bin_width, BIN_HEIGHT, BLACK, PURPLE);
+        svg_rect(TEXT_WIDTH, top, bin_width, BIN_HEIGHT, BLACK, RED);
         top += BIN_HEIGHT;
     }
 

svg.h

@@ -2,6 +2,6 @@
 #include <vector>
 #include <string>
 #include <math.h>
-
 using namespace std;
-void show_histogram_svg(const vector<size_t>& bins);
+
+void show_histogram_svg(const vector<size_t>& bins, size_t block_width);

text.h

@@ -2,3 +2,4 @@
 #include <vector>
 
 void show_histogram(std::vector<size_t> bins);
+

unittest.cbp

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

unittest.depend

@@ -6,3 +6,54 @@
 	<vector>
 	<iostream>
 
+1746276122 source:c:\users\natasha\desktop\Ïðîãè Ñ2\cs-lab34\unittest.cpp
+	"doctest.h"
+	"histogram_internal.h"
+
+1746276122 c:\users\natasha\desktop\Ïðîãè Ñ2\cs-lab34\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>
+
+1746276025 c:\users\natasha\desktop\Ïðîãè Ñ2\cs-lab34\histogram_internal.h
+