diff --git a/histogram.cpp b/histogram.cpp index 0506380..268ee01 100644 --- a/histogram.cpp +++ b/histogram.cpp @@ -3,23 +3,19 @@ using namespace std; -void find_minmax(const vector &numbers, double &min, double &max) -{ - min = numbers[1]; - max = numbers[0]; - for (double x: numbers) +void find_minmax(const vector& numbers, double& min, double& max) { + if (numbers.empty()) { - if (x < min) - { - min = x; - } - else if (x > max) - { - - max = x; - } + min = 0; + max = 0; + return; + } + max = numbers[0]; + min = numbers[0]; + for (double x : numbers) { + if (x < min) min = x; + else if (x > max) max = x; } - return; } diff --git a/main.cpp b/main.cpp index ff31196..584252c 100644 --- a/main.cpp +++ b/main.cpp @@ -28,6 +28,10 @@ Input input_data(){ int main() { + if (in.numbers.empty()) { + cerr << "Error: The data set is empty." << endl; + return EXIT_FAILURE; + } auto in = input_data(); auto bins = make_histogram(in.numbers, in.bin_count); show_histogram_text(bins, in.bin_count); diff --git a/svg.cpp b/svg.cpp new file mode 100644 index 0000000..f17f5a8 --- /dev/null +++ b/svg.cpp @@ -0,0 +1,62 @@ +#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 << "\n"; +} + +void svg_rect(double x, double y, double width, double height, string stroke = "black", string fill = "black") { + cout << "\n"; +} + +void show_histogram_svg(const vector& bins) { + if (bins.empty()) { + cerr << "Error: Empty bins vector\n"; + return; + } + + 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 MAX_WIDTH = IMAGE_WIDTH - TEXT_WIDTH; + + svg_begin(IMAGE_WIDTH, IMAGE_HEIGHT); + + double top = 0; + size_t max_count = bins[0]; + for (size_t bin : bins) { + if (max_count < bin) { + max_count = bin; + } + } + + for (size_t bin : bins) { + const double bin_width = MAX_WIDTH * (static_cast(bin) / max_count); + svg_text(TEXT_LEFT, top + TEXT_BASELINE, to_string(bin)); + svg_rect(TEXT_WIDTH, top, bin_width, BIN_HEIGHT, "black", "red"); + top += BIN_HEIGHT; + } + + svg_end(); +} diff --git a/svg.h b/svg.h new file mode 100644 index 0000000..44245d0 --- /dev/null +++ b/svg.h @@ -0,0 +1,9 @@ +#ifndef SVG_H_INCLUDED +#define SVG_H_INCLUDED + +#include +#include + +void show_histogram_svg(const std::vector& bins); + +#endif // SVG_H_INCLUDED diff --git a/unittest/unittest.cpp b/unittest/unittest.cpp index 1f5e525..bf37c5e 100644 --- a/unittest/unittest.cpp +++ b/unittest/unittest.cpp @@ -35,3 +35,10 @@ TEST_CASE("single element vector") { CHECK(max == 7); } +TEST_CASE("empty vector") { + double min = 0; + double max = 0; + find_minmax({}, min, max); + CHECK(min == 0); + CHECK(max == 0); +}