diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..9fd8329 --- /dev/null +++ b/.gitignore @@ -0,0 +1,4 @@ +/bin +/obj +/lab01.layout +/curl diff --git a/histogram.cpp b/histogram.cpp new file mode 100644 index 0000000..61c3e6b --- /dev/null +++ b/histogram.cpp @@ -0,0 +1,49 @@ +#include +#include + +#include "histogram.h" + +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){ + + vector bins(bin_count); + double min, max; + find_minmax(numbers, min, max); + + double bin_size = (max - min) / 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..fa931b6 --- /dev/null +++ b/histogram.h @@ -0,0 +1,11 @@ +#ifndef HISTOGRAM_H_INCLUDED +#define HISTOGRAM_H_INCLUDED + +#include + +std::vector +make_histogram(const std::vector numbers, size_t bin_count); + + + +#endif // HISTOGRAM_H_INCLUDED diff --git a/histogram_internal.h b/histogram_internal.h new file mode 100644 index 0000000..ee51206 --- /dev/null +++ b/histogram_internal.h @@ -0,0 +1,8 @@ +#ifndef HISTOGRAM_INTERNAL_H_INCLUDED +#define HISTOGRAM_INTERNAL_H_INCLUDED + +void +find_minmax(const std::vector& numbers, double& min, double& max); + + +#endif // HISTOGRAM_INTERNAL_H_INCLUDED diff --git a/svg.cpp b/svg.cpp new file mode 100644 index 0000000..26e981e --- /dev/null +++ b/svg.cpp @@ -0,0 +1,76 @@ +#include +#include +#include +#include +#include +#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, string fill){ + cout << ""; + +} + + + +void +show_histogram_svg(const vector& bins, size_t number_count, size_t bin_count) { + const auto IMAGE_WIDTH = 400; + auto IMAGE_HEIGHT = 700; + 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 MAX_WIDTH = IMAGE_WIDTH-TEXT_WIDTH; + + cerr << "Input IMAGE_HEIGHT: "; + cin >> IMAGE_HEIGHT; + if (IMAGE_HEIGHT > 700){ + IMAGE_HEIGHT=IMAGE_HEIGHT; + } + + svg_begin(IMAGE_WIDTH, IMAGE_HEIGHT); + + double top = 0; + + double max_count = bins[0]; + for (size_t i = 0; i < bins.size(); i++){ + if (bins[i] > max_count) + max_count = bins[i]; + } + + for (size_t bin : bins) { + const double bin_width = (IMAGE_WIDTH - TEXT_WIDTH)*(bin/max_count); + svg_text(TEXT_LEFT, top + TEXT_BASELINE, to_string(bin)); + svg_rect(TEXT_WIDTH, top, bin_width, BIN_HEIGHT,"#FFFFFF","#32CD32"); + top += BIN_HEIGHT; + } + + svg_end(); +} + + diff --git a/svg.h b/svg.h new file mode 100644 index 0000000..c284e93 --- /dev/null +++ b/svg.h @@ -0,0 +1,11 @@ +#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..e11a834 --- /dev/null +++ b/text.cpp @@ -0,0 +1,21 @@ +#include +#include +#include "text.h" + +using namespace std; + +void +show_histogram_text(const vector bins, size_t number_count, size_t bin_count){ + + for (size_t i = 0; i < bin_count; i++){ + + if (bins[i] < 100) cout << " "; + if (bins[i] < 10) cout << " "; + cout << bins[i] << "|"; + + for(size_t j=0; j < bins[i]; j++){ + cout << "*"; + } + cout< + + + + + diff --git a/unittest.cpp b/unittest.cpp new file mode 100644 index 0000000..8ae27f7 --- /dev/null +++ b/unittest.cpp @@ -0,0 +1,39 @@ +#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 with one element"){ + double min = 0; + double max = 0; + find_minmax({1}, min, max); + CHECK(min == 1); + CHECK(max == 1); +} + +TEST_CASE("vector of negative elements"){ + double min = 0; + double max = 0; + find_minmax({-1, -2}, min, max); + CHECK(min == -2); + CHECK(max == -1); +} + +TEST_CASE("vector of identical elements"){ + double min = 0; + double max = 0; + find_minmax({2, 2}, min, max); + CHECK(min == 2); + CHECK(max == 2); +} + + +