commit ac50fd1329f5fca2d471177c960755e2a4031dd3 Author: KozlovDanD Date: Sun Jun 1 19:21:07 2025 +0300 build: код для ЛР-3 полный 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/histogram.cpp b/histogram.cpp new file mode 100644 index 0000000..516a6d4 --- /dev/null +++ b/histogram.cpp @@ -0,0 +1,49 @@ +#include +#include +#include "histogram.h" +//afasfaafasfaa +using namespace std; + +void find_minmax(const vector &numbers, double &min, double &max) +{ + min = numbers[0]; + max = numbers[0]; + for (double x : numbers) + { + if (x < min) + { + min = x; + } + else if (x > max) + { + max = x; + } + } +} +vector make_histogram(const vector &numbers, size_t bin_count) +{ + double min, max; + find_minmax(numbers, min, max); + double bin_size = (max - min) / bin_count; + vector 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; +} diff --git a/histogram.h b/histogram.h new file mode 100644 index 0000000..90ba544 --- /dev/null +++ b/histogram.h @@ -0,0 +1,4 @@ +#pragma once +#include + +std::vector make_histogram(const std::vector& numbers, std::size_t bin_count); diff --git a/histogram_internal.h b/histogram_internal.h new file mode 100644 index 0000000..ac2f4af --- /dev/null +++ b/histogram_internal.h @@ -0,0 +1,4 @@ +#pragma once +#include + +void find_minmax(const std::vector &numbers, double &min, double &max); diff --git a/lab04.cbp b/lab04.cbp new file mode 100644 index 0000000..8a3ed56 --- /dev/null +++ b/lab04.cbp @@ -0,0 +1,55 @@ + + + + + + diff --git a/main.cpp b/main.cpp new file mode 100644 index 0000000..0694812 --- /dev/null +++ b/main.cpp @@ -0,0 +1,48 @@ +#include +#include +#include "histogram.h" +#include "text.h" +#include "svg.h" + +using namespace std; +struct Input +{ + vector numbers; + size_t bin_count{}; +}; + +Input +input_data() +{ + Input in; + size_t number_count; + cerr << "Enter number count: "; + cin >> number_count; + + in.numbers.resize(number_count); + vector numbers(number_count); + + for (size_t i = 0; i < number_count; i++) + { + cerr << "Enter numbers: "; + cin >> in.numbers[i]; + } + size_t bin_count; + cerr << "Enter bin count: "; + cin >> in.bin_count; + return in; +} + +int main() +{ + Input in = input_data(); + auto bins = make_histogram(in.numbers, in.bin_count); + + double min, max; + double bin_size = (max - min) / in.bin_count; + // show_histogram_text(bins, in.bin_count, bin_size); + show_histogram_svg(bins); + //# + () + +} +// | 3 3 5 5 5 4 4 4 4 4 diff --git a/svg.cpp b/svg.cpp new file mode 100644 index 0000000..86a7e0a --- /dev/null +++ b/svg.cpp @@ -0,0 +1,82 @@ +#include "svg.h" + +using namespace std; + +void +svg_begin(double width, double height) +{ + cout << "\n"; + cout << "\n"; +} + +void +svg_end() +{ + cout << "\n"; +} + +void +svg_text(double left, double baseline, string text) +{ + cout << "" << text << ""; + +} + +void svg_rect(double x, double y, double width, double height, + string stroke = "black", string fill = "#071de8") +{ + cout << "\n"; +} + +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; + const auto YELLOW = "yellow"; + const auto RED = "red"; + const auto MAX_WIDTH = IMAGE_WIDTH-TEXT_WIDTH; + + svg_begin(IMAGE_WIDTH, IMAGE_HEIGHT); + + size_t min,max; + min = bins[0]; + max = bins[0]; +for (size_t bin : bins) + { + if (bin < min) + { + min = bin; + } + else if (bin > max) + { + max = bin; + } + } + + double top = 0; + for (size_t bin : bins) + { if (bin == max) { + const double bin_width = BLOCK_WIDTH * bin; + svg_text(TEXT_LEFT, top + TEXT_BASELINE, to_string(bin)); + svg_rect(TEXT_WIDTH, top, MAX_WIDTH, BIN_HEIGHT); + top += BIN_HEIGHT; + } + else{ + const double bin_width = BLOCK_WIDTH * bin; + svg_text(TEXT_LEFT, top + TEXT_BASELINE, to_string(bin)); + svg_rect(TEXT_WIDTH, top, bin_width, BIN_HEIGHT); + top += BIN_HEIGHT; + } + } + svg_end(); +} diff --git a/svg.h b/svg.h new file mode 100644 index 0000000..8dd3117 --- /dev/null +++ b/svg.h @@ -0,0 +1,11 @@ +#ifndef SVG_H_INCLUDED +#define SVG_H_INCLUDED + +#include +#include +#include + +void show_histogram_svg(const std::vector& bins); + + +#endif // SVG_H_INCLUDED diff --git a/text.cpp b/text.cpp new file mode 100644 index 0000000..ebeb410 --- /dev/null +++ b/text.cpp @@ -0,0 +1,58 @@ +#include +#include +#include "histogram.h" +#include "text.h" + +using namespace std; + +void show_histogram_text(const vector& bins, size_t& bin_count, double bin_size) +{ + const size_t SCREEN_WIDTH = 80; + const size_t MAX_ASTERISK = SCREEN_WIDTH - 3 - 1; + size_t max_bin_count = bins[0]; + for(size_t i = 0; i < bin_count; i++) + { + if(bins[i] > max_bin_count) + { + max_bin_count = bins[i]; + } + } + + for(size_t i = 0; i < bin_count; i++) + { + if(bins[i]<10) + { + cout<< " " << bins[i] << "|"; + } + else + { + if(bins[i]<100) + { + cout<< " " << bins[i] << "|"; + } + else + { + if(bins[i]<1000) + { + cout<< bins[i] << "|"; + } + + } + } + + size_t height; + if(max_bin_count <= MAX_ASTERISK) + { + height = bins[i]; + } + else + { + height = MAX_ASTERISK * (static_cast(bins[i]) / max_bin_count); + } + for(size_t j = 0; j < height; j ++) + { + cout<<"*"; + } + cout< + +void show_histogram_text(const std::vector& bins, std::size_t& bin_count, double bin_size); + diff --git a/unittest b/unittest new file mode 100644 index 0000000..7f9621b --- /dev/null +++ b/unittest @@ -0,0 +1,38 @@ + + + + + + diff --git a/unittest.cpp b/unittest.cpp new file mode 100644 index 0000000..217a41a --- /dev/null +++ b/unittest.cpp @@ -0,0 +1,60 @@ + #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("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("vector of the one elements") +{ + double min = 0; + double max = 0; + find_minmax({3}, min, max); + CHECK(min == max); +} +TEST_CASE("negative numbers") +{ + double min = 0; + double max = 0; + find_minmax({-1, -2}, min, max); + CHECK(min == -2); + CHECK(max == -1); +} +TEST_CASE("positive and negative numbers") +{ + double min = 0; + double max = 0; + find_minmax({-1, 2, 0, -3, 5}, min, max); + CHECK(min == -3); + CHECK(max == 5); +} +TEST_CASE("positive and negative numbers") +{ + double min = 0; + double max = 0; + find_minmax({-1, 2, 0, -3, 5}, min, max); + CHECK(min == -3); + CHECK(max == 5); +} + +TEST_CASE("none elements") +{ + double min = 0; + double max = 0; + CHECK_NOTHROW(find_minmax({}, min, max)); +}