From bde9f5ec7d727495949188c4f3226e3bbe77aa63 Mon Sep 17 00:00:00 2001 From: ChirkaAR Date: Sun, 25 May 2025 16:22:16 +0300 Subject: [PATCH] =?UTF-8?q?=D0=B8=D0=B7=D0=BC=D0=B5=D0=BD=D0=B8=D0=B5=20?= =?UTF-8?q?=D1=84=D1=83=D0=BD=D0=BA=D1=86=D0=B8=D0=B8=20input=5Fdata=20?= =?UTF-8?q?=D0=B8=20=D0=B4=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5=D0=BD=D0=B8?= =?UTF-8?q?=D0=B5=20prompt?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 2 ++ README.md | 0 histogram.cpp | 8 +++++- histogram_internal.h | 4 +-- lab01.cbp | 13 ++++++++++ lab01.depend | 32 +++++++++++++++++++++++ lab01.layout | 40 ++++++++++++++++++++++++++++ main.cpp | 25 ++++++++++++------ svg.cpp | 46 +++++++++++++++++++++++++++++--- unittest.cbp | 4 +++ unittest.cpp | 20 ++++++++++++++ unittest.depend | 62 ++++++++++++++++++++++++++++++++++++++++++++ unittest.layout | 20 ++++++++++++++ 13 files changed, 261 insertions(+), 15 deletions(-) create mode 100644 .gitignore create mode 100644 README.md create mode 100644 lab01.depend create mode 100644 lab01.layout create mode 100644 unittest.depend create mode 100644 unittest.layout diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..4c7473d --- /dev/null +++ b/.gitignore @@ -0,0 +1,2 @@ +/bin +/obj diff --git a/README.md b/README.md new file mode 100644 index 0000000..e69de29 diff --git a/histogram.cpp b/histogram.cpp index 0b5f9d1..9637586 100644 --- a/histogram.cpp +++ b/histogram.cpp @@ -3,8 +3,13 @@ #include using namespace std; -void find_minmax(const vector& numbers, double& minN, double& maxN) +//std::vector +bool find_minmax(const vector& numbers, double& minN, double& maxN) { + if (numbers.empty()) { + minN = maxN = 0; + return false; + } minN = numbers[0]; maxN = numbers[0]; @@ -19,6 +24,7 @@ void find_minmax(const vector& numbers, double& minN, double& maxN) maxN = x; } } + return true; } vector make_histogram(const vector& numbers, size_t bin_count) diff --git a/histogram_internal.h b/histogram_internal.h index 54abeff..94c5561 100644 --- a/histogram_internal.h +++ b/histogram_internal.h @@ -3,7 +3,7 @@ #include -std::vector -find_minmax( const std::vector& numbers, double& minN, double& maxN); +//std::vector +bool find_minmax(const std::vector& numbers, double& minN, double& maxN); #endif // HISTOGRAM_INTERNAL_H_INCLUDED diff --git a/lab01.cbp b/lab01.cbp index 247aa25..dbd06a2 100644 --- a/lab01.cbp +++ b/lab01.cbp @@ -33,7 +33,20 @@ + + + + + + + + + + diff --git a/lab01.depend b/lab01.depend new file mode 100644 index 0000000..9697ef3 --- /dev/null +++ b/lab01.depend @@ -0,0 +1,32 @@ +# depslib dependency file v1.0 +1745706239 source:c:\users\lenovo\documents\labsproga2sem\firstlaba\lab01\main.cpp + + + "histogram.h" + "text.h" + "svg.h" + +1745844301 source:c:\users\lenovo\documents\labsproga2sem\firstlaba\lab01\histogram.cpp + "histogram.h" + + + +1745703309 c:\users\lenovo\documents\labsproga2sem\firstlaba\lab01\histogram.h + + +1745703516 source:c:\users\lenovo\documents\labsproga2sem\firstlaba\lab01\text.cpp + "text.h" + + + +1745703516 c:\users\lenovo\documents\labsproga2sem\firstlaba\lab01\text.h + + +1745706239 c:\users\lenovo\documents\labsproga2sem\firstlaba\lab01\svg.h + + + +1745708042 source:c:\users\lenovo\documents\labsproga2sem\firstlaba\lab01\svg.cpp + "svg.h" + + diff --git a/lab01.layout b/lab01.layout new file mode 100644 index 0000000..ed08247 --- /dev/null +++ b/lab01.layout @@ -0,0 +1,40 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/main.cpp b/main.cpp index e48cec4..df53d37 100644 --- a/main.cpp +++ b/main.cpp @@ -13,28 +13,37 @@ struct Input }; Input -input_data() +input_data(istream& in, bool prompt) { - Input in; + Input cin; + string numbCntPrmt, numbsPrmt, binCntPrmt; + if (prompt == true) { + numbCntPrmt = "Enter number count: "; + numbsPrmt = "Enter numbers: "; + binCntPrmt = "Enter bin count: "; + } size_t number_count; - cin >> number_count; - in.numbers.resize(number_count); + cerr << numbCntPrmt; + in >> number_count; + cin.numbers.resize(number_count); vector numbers(number_count); + cerr << numbsPrmt; for (size_t i = 0; i < number_count; i++) { - cin >> in.numbers[i]; + in >> cin.numbers[i]; } - cin >> in.bin_count; - return in; + cerr << binCntPrmt; + in >> cin.bin_count; + return cin; } int main() { size_t max_count; - auto in = input_data(); + auto in = input_data(cin, true); auto bins = make_histogram(in.numbers, in.bin_count); show_histogram_svg(bins); } diff --git a/svg.cpp b/svg.cpp index 1036f55..5022b1d 100644 --- a/svg.cpp +++ b/svg.cpp @@ -2,7 +2,7 @@ #include using namespace std; -svg_begin(double width, double height) { +void svg_begin(double width, double height) { cout << "\n"; cout << "" << text << ""; } + void svg_rect(double x, double y, double width, double height, string stroke = "black", string fill = "black") { cout << ""; } + + + +//Çàùèòà +/* +void svg_rect(double x, double y, double width, double height, string stroke = "black", string fill = "black", double fill_opacity = 1.0) { + cout << ""; +} + +void show_histogram_svg(const vector& 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; + + size_t max_count = *max_element(bins.begin(), bins.end()); + if (max_count == 0) max_count = 1; + + svg_begin(IMAGE_WIDTH, IMAGE_HEIGHT); + double top = 0; + + for (size_t bin : bins) { + const double bin_width = min(static_cast(BLOCK_WIDTH * bin), static_cast(IMAGE_WIDTH - TEXT_WIDTH)); + double opacity = static_cast(bin) / max_count; + + svg_text(TEXT_LEFT, top + TEXT_BASELINE, to_string(bin)); + svg_rect(TEXT_WIDTH, top, bin_width, BIN_HEIGHT, + "blue", "green", opacity); + top += BIN_HEIGHT; + } + + svg_end(); +} +*/ + void show_histogram_svg(const vector& bins) { const auto IMAGE_WIDTH = 400; const auto IMAGE_HEIGHT = 300; @@ -46,9 +87,6 @@ void show_histogram_svg(const vector& bins) { svg_rect(TEXT_WIDTH, top, bin_width, BIN_HEIGHT, "blue", "green"); top += BIN_HEIGHT; } - - //svg_text(20, 20, to_string(bins[0])); - //svg_rect(50, 0, bins[0] * 10, 30); svg_end(); } diff --git a/unittest.cbp b/unittest.cbp index 7f9621b..1fa0b37 100644 --- a/unittest.cbp +++ b/unittest.cbp @@ -31,6 +31,10 @@ + + + + diff --git a/unittest.cpp b/unittest.cpp index e531bdb..7ea135b 100644 --- a/unittest.cpp +++ b/unittest.cpp @@ -2,6 +2,7 @@ #define DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN #include "doctest.h" #include "histogram_internal.h" +#include TEST_CASE("distinct positive numbers") { double min = 0; @@ -9,7 +10,9 @@ TEST_CASE("distinct positive numbers") { find_minmax({1, 2}, min, max); CHECK(min == 1); CHECK(max == 2); + CHECK(find_minmax({1, 2}, min, max)); } + TEST_CASE("distinct negative numbers") { double min = 0; @@ -17,6 +20,7 @@ TEST_CASE("distinct negative numbers") find_minmax({-1, -2}, min, max); CHECK(min == -2); CHECK(max == -1); + CHECK(find_minmax({-1, -2}, min, max)); } TEST_CASE("vector 1 element") { @@ -25,4 +29,20 @@ TEST_CASE("vector 1 element") find_minmax({1}, min, max); CHECK(min == 1); CHECK(max == 1); + CHECK(find_minmax({1}, min, max)); +} +TEST_CASE("distinct equals numbers") +{ + double min = 0; + double max = 0; + find_minmax({1, 1}, min, max); + CHECK(min == 1); + CHECK(max == 1); + CHECK(find_minmax({1, 1}, min, max)); +} +TEST_CASE("distinct empty vector") +{ + double min = -1; + double max = -1; + CHECK(!find_minmax({}, min, max)); } diff --git a/unittest.depend b/unittest.depend new file mode 100644 index 0000000..3f24716 --- /dev/null +++ b/unittest.depend @@ -0,0 +1,62 @@ +# depslib dependency file v1.0 +1745848382 source:c:\users\lenovo\documents\labsproga2sem\firstlaba\lab01\histogram.cpp + "histogram.h" + + + +1745845585 c:\users\lenovo\documents\labsproga2sem\firstlaba\lab01\histogram.h + + +1745848628 source:c:\users\lenovo\documents\labsproga2sem\firstlaba\lab01\unittest.cpp + "doctest.h" + "histogram_internal.h" + + +1745704427 c:\users\lenovo\documents\labsproga2sem\firstlaba\lab01\doctest.h + + + + + + + "doctest_fwd.h" + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +1745848412 c:\users\lenovo\documents\labsproga2sem\firstlaba\lab01\histogram_internal.h + + diff --git a/unittest.layout b/unittest.layout new file mode 100644 index 0000000..e6083f4 --- /dev/null +++ b/unittest.layout @@ -0,0 +1,20 @@ + + + + + + + + + + + + + + + + + + + +