code: добавлена функция вывода гистограммы в формате SVG

main
ShchegolikhYR 2 месяцев назад
Родитель 5ce5f598fb
Сommit 5d03d10f09

@ -3,7 +3,7 @@
using namespace std;
static void find_minmax(const vector<double>& numbers, double& minimum, double& maximum) {
void find_minmax(const vector<double>& numbers, double& minimum, double& maximum) {
minimum = numbers[0];
maximum = numbers[0];
for (auto i : numbers) {

@ -3,7 +3,7 @@
#include <string>
#include "histogram.hpp"
#include "text.hpp"
#include "svg.hpp"
using namespace std;
struct Input {
@ -29,61 +29,9 @@ Input input_data() {
return in;
}
//void find_minmax(const vector<double>& numbers, double& minimum, double& maximum) {
// minimum = numbers[0];
// for (int i : numbers) {
// if (i < minimum) minimum = i;
// }
// maximum = numbers[0];
// for (int i : numbers) {
// if (i > maximum) maximum = i;
// }
//}
//vector<size_t> make_histogram(const vector<double>& numbers, size_t& bin_count) {
// vector <size_t> baskets;
// baskets.resize(bin_count);
//
// double basket_max;
// double basket_min;
// double basket_size;
//
// find_minmax(numbers, basket_min, basket_max);
// basket_size = (basket_max - basket_min) / bin_count;
// for (int i = 0; i < bin_count; i++) {
// for (int j = 0; j < numbers.size(); j++) {
// if ((numbers[j] >= (basket_min + i * basket_size) and numbers[j] < (basket_min + (i + 1) * basket_size)) or (i == bin_count - 1 and numbers[j] == basket_max)) {
// baskets[i]++;
// }
// }
// }
// return baskets;
//}
//void show_histogram_text(const vector<size_t>& baskets) {
// const size_t screen_width = 80;
// const size_t max_asterisk = screen_width - 3 - 1;
// cout.precision(4);
// size_t baskets_max_count;
//
// baskets_max_count = baskets[0];
// for (size_t i : baskets) {
// if (i > baskets_max_count) baskets_max_count = i;
// }
// for (int i = 0; i < baskets.size(); i++) {
// size_t height = baskets[i];
// if (baskets_max_count > max_asterisk) {
// height = max_asterisk * (static_cast<double>(baskets[i]) / baskets_max_count);
// }
// cout << baskets[i] << "|";
// for (int j = 0; j < height; j++) cout << "*";
// cout << endl;
// }
//}
int main () {
auto in = input_data();
auto bins = make_histogram(in.numbers, in.bin_count);
show_histogram_text(bins);
show_histogram_svg(bins);
return 0;
}

@ -0,0 +1,47 @@
#include "svg.hpp"
#include <iostream>
#include <vector>
using namespace std;
void svg_begin(double width, double height) {
cout << "<?xml version='1.0' encoding='UTF-8'?>\n";
cout << "<svg ";
cout << "width='" << width << "' ";
cout << "height='" << height << "' ";
cout << "viewBox='0 0 " << width << " " << height << "' ";
cout << "xmlns='http://www.w3.org/2000/svg'>\n";
}
void svg_end() {
cout << "</svg>\n";
}
void svg_text(double left, double baseline, string text) {
cout << "<text x='" << left << "' y='" << baseline << "'>" << text << "</text>";
}
void show_histogram_svg(const vector<size_t>& 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);
double top = 0;
for (size_t bin : bins) {
const double bin_width = BLOCK_WIDTH * bin;
svg_text(TEXT_LEFT, top + TEXT_BASELINE, to_string(bin));
svg_rect(TEXT_WIDTH, top, bin_width, BIN_HEIGHT);
top += BIN_HEIGHT;
}
svg_end();
}
void svg_rect(double x, double y, double width, double height, string stroke, string fill) {
cout << "<rect x='" << x << "' y='" << y << "' width='" << width << "' height='" << height << "' stroke='" << stroke << "' fill='" << fill << "'/>";
}

@ -0,0 +1,12 @@
#ifndef svg_hpp
#define svg_hpp
#include <vector>
#include <string>
void svg_begin(double width, double height);
void svg_end();
void svg_text(double left, double baseline, std::string text);
void show_histogram_svg(const std::vector<size_t>& bins);
void svg_rect(double x, double y, double width, double height, std::string stroke = "black", std::string fill = "black");
#endif /* svg_hpp */
Загрузка…
Отмена
Сохранить