diff --git a/Lab01.cbp b/Lab01.cbp
index fafc2c3..aff3a35 100644
--- a/Lab01.cbp
+++ b/Lab01.cbp
@@ -36,6 +36,8 @@
+
+
diff --git a/main.cpp b/main.cpp
index f29ddf9..d4e7d58 100644
--- a/main.cpp
+++ b/main.cpp
@@ -2,6 +2,7 @@
#include
#include "histogram.h"
#include "text.h"
+#include "svg.h"
using namespace std;
struct Input
{
@@ -30,9 +31,9 @@ int
main()
{
bool res = false;
- Input in = input_data();
+ auto in = input_data();
auto bins = make_histogram(in.numbers, in.bin_count);
- show_histogram_text(bins);
+ show_histogram_svg(bins);
}
diff --git a/svg.cpp b/svg.cpp
new file mode 100644
index 0000000..dbee47e
--- /dev/null
+++ b/svg.cpp
@@ -0,0 +1,67 @@
+#include
+#include
+#include "svg.h"
+
+void
+svg_begin(double width, double height) {
+ std::cout << "\n";
+ std::cout << "\n";
+}
+
+void
+svg_text(double left, double baseline, std::string text) {
+ std::cout << " " << text << " ";
+}
+
+void svg_rect(double x, double y, double width, double height){
+ std::cout << "";
+}
+
+void
+show_histogram_svg(const std::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 std::size_t MAX_ASTERISK = IMAGE_WIDTH - TEXT_WIDTH;
+ svg_begin(IMAGE_WIDTH, IMAGE_HEIGHT);
+ double top = 0;
+
+ std::size_t maxbin=bins[0];
+ for (std::size_t i=0; i < bins.size(); i++){
+ if (maxbin < bins[i]){
+ maxbin=bins[i];
+ }
+ }
+
+ if (maxbin<=76){
+ for (std::size_t i=0; i < bins.size(); i++) {
+ double bin_width = BLOCK_WIDTH * bins[i];
+ svg_text(TEXT_LEFT, top + TEXT_BASELINE, std::to_string(bins[i]));
+ svg_rect(TEXT_WIDTH, top, bin_width, BIN_HEIGHT);
+ top += BIN_HEIGHT;
+ }
+ svg_end();
+ } else {
+ for (std::size_t i=0; i < bins.size(); i++) {
+ double bin_width= MAX_ASTERISK * (static_cast(bins[i]) / maxbin);
+ svg_text(TEXT_LEFT, top + TEXT_BASELINE, std::to_string(bins[i]));
+ 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..c7da98d
--- /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);
+
+#endif // SVG_H_INCLUDED
diff --git a/unittest.cpp b/unittest.cpp
index 52652b5..3cfebd4 100644
--- a/unittest.cpp
+++ b/unittest.cpp
@@ -55,13 +55,3 @@ TEST_CASE("same number") {
CHECK(max == 1);
CHECK(res==0);
}
-
-TEST_CASE("same number but zero") {
- bool res = false;
- double min = 0;
- double max = 0;
- find_minmax({0,0,0,0}, min, max, res);
- CHECK(min == 0);
- CHECK(max == 0);
- CHECK(res==0);
-}