diff --git a/histogram.cpp b/histogram.cpp new file mode 100644 index 0000000..07920db --- /dev/null +++ b/histogram.cpp @@ -0,0 +1,59 @@ +#include +#include "histogram.h" +#include "histogram_internal.h" + +using namespace std; + + +void find_minmax(const vector& numbers, double& min, double& max){ + if(numbers.empty()) + { + return; + } + min = numbers[0]; + max = numbers[0]; + for (double x : numbers) + { + if (x < min) + { + min = x; + } + else if (x > max) + { + max = x; + } + } +} + +vectormake_histogram(const vector& numbers, size_t bin_count) +{ + double min, max; + find_minmax(numbers, min, max); + + vector bins(bin_count,0); + + + double bin_size = (max-min)/bin_count; + + for (double number : numbers) + { + 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 <= number && number < 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..caa7558 --- /dev/null +++ b/histogram.h @@ -0,0 +1,6 @@ +#pragma once +#include + +std::vector make_histogram(const std::vector& numbers, size_t bin_count); +void find_minmax(const std::vector & numbers, double& min, double& max); + diff --git a/histogram_internal.h b/histogram_internal.h new file mode 100644 index 0000000..45827ed --- /dev/null +++ b/histogram_internal.h @@ -0,0 +1,6 @@ +#pragma once +#include + +void find_minmax(const std::vector& numbers, double& min, double& max); + + diff --git a/obj/Debug/histogram.o b/obj/Debug/histogram.o new file mode 100644 index 0000000..48d644d Binary files /dev/null and b/obj/Debug/histogram.o differ diff --git a/obj/Debug/main.o b/obj/Debug/main.o new file mode 100644 index 0000000..87b3a21 Binary files /dev/null and b/obj/Debug/main.o differ diff --git a/obj/Debug/svg.o b/obj/Debug/svg.o new file mode 100644 index 0000000..9a5c56a Binary files /dev/null and b/obj/Debug/svg.o differ diff --git a/obj/Debug/text.o b/obj/Debug/text.o new file mode 100644 index 0000000..98ecf8d Binary files /dev/null and b/obj/Debug/text.o differ diff --git a/project.cbp b/project.cbp new file mode 100644 index 0000000..99bb702 --- /dev/null +++ b/project.cbp @@ -0,0 +1,40 @@ + + + + + + diff --git a/svg.cpp b/svg.cpp new file mode 100644 index 0000000..60d72a5 --- /dev/null +++ b/svg.cpp @@ -0,0 +1,66 @@ + +#include +#include +#include "svg.h" +#include "algorithm" + +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 << "\n"; +} + +void svg_rect(double x, double y, double width, double height, string stroke, string fill) +{ + 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; + + svg_begin(IMAGE_WIDTH,IMAGE_HEIGHT); + + size_t max_bin ='max_element(bins.begin(), bins.end())'; + double scaling_factor = 1.0; + if (max_bin * BLOCK_WIDTH>IMAGE_WIDTH - TEXT_WIDTH){ + scaling_factor = static_cast(IMAGE_WIDTH - TEXT_WIDTH)/(max_bin * BLOCK_WIDTH); + } + + double top = 0; + for (size_t bin : bins) + { + const double bin_width = BLOCK_WIDTH *bin *scaling_factor; + svg_text(TEXT_LEFT, top + TEXT_BASELINE, to_string(bin)); + svg_rect(TEXT_WIDTH, top, bin_width, BIN_HEIGHT,"red","#ffeeee"); + top += BIN_HEIGHT; + } + + svg_end(); +} + diff --git a/svg.h b/svg.h new file mode 100644 index 0000000..a6e8ad4 --- /dev/null +++ b/svg.h @@ -0,0 +1,9 @@ +#ifndef SVG_H_INCLUDED +#define SVG_H_INCLUDED + +#include +void +show_histogram_svg(const std::vector& bins, size_t number_count, size_t bin_count); + + +#endif // SVG_H_INCLUDED diff --git a/text.cpp b/text.cpp new file mode 100644 index 0000000..738a500 --- /dev/null +++ b/text.cpp @@ -0,0 +1,52 @@ +#include +#include "text.h" + +using namespace std; + +const size_t SCREEN_WIDTH = 80; +const size_t MAX_ASTERISK = SCREEN_WIDTH -3 -1; + +void +show_histogram_text(const vector& bins) +{ + size_t max_count = 0; + for (size_ count : bins) + { + if (count > max_count) + { + max_count = count; + } + } + + for (size_t count :bins) + { + if (count <10) + { + cout << " " << cout <<"|"; + } + else if (count < 100) + { + cout<<" " << cout << "|"; + } + if (count <1000) + { + cout << cout <<"|"; + } + size_t height; + if (max_count <= MAX_ASTERISK) + { + height=count; + } + else + { + height = static_cast(MAX_ASTERISK*(static_cast(count)/ max_count)); + + } + + for (size_t j = 0; j< height ; j++) + { + cout << "*"; + } + cout << endl; + } +} diff --git a/text.h b/text.h new file mode 100644 index 0000000..becc676 --- /dev/null +++ b/text.h @@ -0,0 +1,5 @@ + +#pragma once +#include + +void show_histogram_text(const std::vector bins); diff --git a/unittest.cpp b/unittest.cpp new file mode 100644 index 0000000..70d54ac --- /dev/null +++ b/unittest.cpp @@ -0,0 +1,50 @@ +#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 1 element") +{ + double min = 0; + double max = 0; + find_minmax({1}, min, max); + CHECK(min == 1); + CHECK(max == 1); +} +TEST_CASE("distinct negativ numbers") +{ + double min = 0; + double max = 0; + find_minmax({-1, -2}, min, max); + CHECK(min == -2); + CHECK(max == -1); +} +TEST_CASE("distinct positive numbers") +{ + double min = 0; + double max = 0; + find_minmax({2, 2}, min, max); + CHECK(min == 2); + CHECK(max == 2); +} + +TEST_CASE("distinct positive numbers") +{ + double min = 0; + double max = 0; + //int n =2; + std::vector vector_pust; + + CHECK(find_minmax(vector_pust, min, max)==false); + + +}