diff --git a/Programm/histogram.cpp b/Programm/histogram.cpp new file mode 100644 index 0000000..86d4bf2 --- /dev/null +++ b/Programm/histogram.cpp @@ -0,0 +1,47 @@ +#include "histogram.h" + +void find_minmax(const std::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; + } + } +} + +std::vector make_histogram(const std::vector &numbers, const size_t &bin_count) +{ + double min, max; + find_minmax(numbers, min, max); + + std::vector bins(bin_count); + 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; +} \ No newline at end of file diff --git a/Programm/histogram.h b/Programm/histogram.h new file mode 100644 index 0000000..c1fb9f8 --- /dev/null +++ b/Programm/histogram.h @@ -0,0 +1,6 @@ +#ifndef HISTOGRAM_H_INCLUDED +#define HISTOGRAM_H_INCLUDED +#include + +std::vector make_histogram(const std::vector &numbers,const size_t& bin_count); +#endif \ No newline at end of file diff --git a/Programm/histogram_internal.h b/Programm/histogram_internal.h new file mode 100644 index 0000000..3b0cdb0 --- /dev/null +++ b/Programm/histogram_internal.h @@ -0,0 +1,6 @@ +#ifndef HISTOGRAM_INTERNAL_H +#define HISTOGRAM_INTERNAL_H +#include + +void find_minmax(const std::vector &numbers, double &min, double &max); +#endif \ No newline at end of file diff --git a/Programm/main.cpp b/Programm/main.cpp new file mode 100644 index 0000000..3dfa2c5 --- /dev/null +++ b/Programm/main.cpp @@ -0,0 +1,38 @@ +#include +#include +#include "histogram.h" +#include "text.h" +#include "svg.h" + +struct Input +{ + std::vector numbers; + size_t bin_count; +}; + +Input input_data() +{ + size_t number_count; + std::cerr << "Enter number count: "; + std::cin >> number_count; + Input in; + in.numbers.resize(number_count); + + for (size_t i = 0; i < number_count; i++) + { + std::cin >> in.numbers[i]; + } + + std::cerr << "Enter bin count: "; + std::cin >> in.bin_count; + return in; +} + + +int main() +{ + Input in = input_data(); + auto bins = make_histogram(in.numbers, in.bin_count); + show_histogram_svg(bins); + return 0; +} \ No newline at end of file diff --git a/Programm/marks.txt b/Programm/marks.txt new file mode 100644 index 0000000..2cdb9aa --- /dev/null +++ b/Programm/marks.txt @@ -0,0 +1,3 @@ +10 +3 3 4 4 4 4 4 5 5 5 +3 diff --git a/Programm/svg b/Programm/svg new file mode 100755 index 0000000..047b150 Binary files /dev/null and b/Programm/svg differ diff --git a/Programm/svg.cpp b/Programm/svg.cpp new file mode 100644 index 0000000..e2dfb58 --- /dev/null +++ b/Programm/svg.cpp @@ -0,0 +1,29 @@ +#include "svg.h" +void svg_text(double left, double baseline, std::string text); + +void svg_begin(double width, double height) +{ + std::cout << "\n"; + std::cout << "\n"; +} + +void svg_end() +{ + std::cout << "\n"; +} + +void svg_text(double left, double baseline, std::string text) +{ + std::cout << "" << text << ""; +} + +void show_histogram_svg(const std::vector &bins) +{ + svg_begin(400, 300); + svg_text(20, 20, std::to_string(bins[0])); + svg_end(); +} \ No newline at end of file diff --git a/Programm/svg.dSYM/Contents/Info.plist b/Programm/svg.dSYM/Contents/Info.plist new file mode 100644 index 0000000..d85c7cc --- /dev/null +++ b/Programm/svg.dSYM/Contents/Info.plist @@ -0,0 +1,20 @@ + + + + + CFBundleDevelopmentRegion + English + CFBundleIdentifier + com.apple.xcode.dsym.svg + CFBundleInfoDictionaryVersion + 6.0 + CFBundlePackageType + dSYM + CFBundleSignature + ???? + CFBundleShortVersionString + 1.0 + CFBundleVersion + 1 + + diff --git a/Programm/svg.dSYM/Contents/Resources/DWARF/svg b/Programm/svg.dSYM/Contents/Resources/DWARF/svg new file mode 100644 index 0000000..eb365e7 Binary files /dev/null and b/Programm/svg.dSYM/Contents/Resources/DWARF/svg differ diff --git a/Programm/svg.h b/Programm/svg.h new file mode 100644 index 0000000..30a1db8 --- /dev/null +++ b/Programm/svg.h @@ -0,0 +1,7 @@ +#ifndef SVG_H +#define SVG_H +#include +#include + +void show_histogram_svg(const std::vector &bins); +#endif \ No newline at end of file diff --git a/Programm/text.cpp b/Programm/text.cpp new file mode 100644 index 0000000..d32b4eb --- /dev/null +++ b/Programm/text.cpp @@ -0,0 +1,41 @@ +#include "text.h" + +void show_histogram_text(const std::vector &bins, const std::vector &numbers) +{ + + const size_t SCREEN_WIDTH = 80; + const size_t MAX_ASTERISK = SCREEN_WIDTH - 5; + size_t max_count = 0; + for (auto bin : bins) + { + if (bin > max_count) + max_count = bin; + } + + for (auto bin : bins) + { + size_t height; + if (max_count <= 76) + { + height = bin; + } + else + { + height = MAX_ASTERISK * (static_cast(bin) / max_count); + } + + int fraction = bin * 100 / numbers.size(); + + if (fraction < 100) + std::cout << ' '; + if (fraction < 10) + std::cout << ' '; + std::cout << bin << "|"; + + for (size_t j = 0; j < height; j++) + { + std::cout << '*'; + } + std::cout << std::endl; + } +} diff --git a/Programm/text.h b/Programm/text.h new file mode 100644 index 0000000..fc4cae5 --- /dev/null +++ b/Programm/text.h @@ -0,0 +1,7 @@ +#ifndef TEXT_H +#define TEXT_H +#include +#include + +void show_histogram_text(const std::vector &bins, const std::vector &numbers); +#endif \ No newline at end of file