code: variant 7+-
Этот коммит содержится в:
1
main.cpp
1
main.cpp
@@ -35,7 +35,6 @@ int main()
|
|||||||
auto in = input_data();
|
auto in = input_data();
|
||||||
auto bins = make_histogram(in.numbers, in.bin_count);
|
auto bins = make_histogram(in.numbers, in.bin_count);
|
||||||
show_histogram_svg(bins);
|
show_histogram_svg(bins);
|
||||||
getch();
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
13
svg.cpp
13
svg.cpp
@@ -4,6 +4,7 @@
|
|||||||
#include <vector>
|
#include <vector>
|
||||||
#include <string>
|
#include <string>
|
||||||
#include "swg.h"
|
#include "swg.h"
|
||||||
|
#include "sr.h"
|
||||||
|
|
||||||
using namespace std;
|
using namespace std;
|
||||||
|
|
||||||
@@ -38,6 +39,7 @@ svg_rect(double x, double y, double width, double height, string stroke = "black
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
void
|
void
|
||||||
show_histogram_svg(const vector<size_t>& bins)
|
show_histogram_svg(const vector<size_t>& bins)
|
||||||
{
|
{
|
||||||
@@ -50,8 +52,10 @@ show_histogram_svg(const vector<size_t>& bins)
|
|||||||
const auto BLOCK_WIDTH = 10;
|
const auto BLOCK_WIDTH = 10;
|
||||||
const auto BLACK = "black";
|
const auto BLACK = "black";
|
||||||
const auto RED = "red";
|
const auto RED = "red";
|
||||||
|
const auto GREEN = "green";
|
||||||
const auto MAX_WIDTH = IMAGE_WIDTH-TEXT_WIDTH;
|
const auto MAX_WIDTH = IMAGE_WIDTH-TEXT_WIDTH;
|
||||||
|
|
||||||
|
size_t x = sr(bins);
|
||||||
|
|
||||||
svg_begin(IMAGE_WIDTH,IMAGE_HEIGHT);
|
svg_begin(IMAGE_WIDTH,IMAGE_HEIGHT);
|
||||||
|
|
||||||
@@ -65,11 +69,18 @@ show_histogram_svg(const vector<size_t>& bins)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
for (size_t bin : bins)
|
for (size_t bin : bins)
|
||||||
{
|
{
|
||||||
double bin_width = (MAX_WIDTH)*(bin/max_count);
|
double bin_width = (MAX_WIDTH)*(bin/max_count);
|
||||||
svg_text(TEXT_LEFT, top + TEXT_BASELINE, to_string(bin));
|
svg_text(TEXT_LEFT, top + TEXT_BASELINE, to_string(bin));
|
||||||
svg_rect(TEXT_WIDTH, top, bin_width, BIN_HEIGHT, BLACK, RED);
|
if (bin_width<=MAX_WIDTH/max_count*x)
|
||||||
|
{
|
||||||
|
svg_rect(TEXT_WIDTH, top, bin_width, BIN_HEIGHT, BLACK, GREEN);
|
||||||
|
}
|
||||||
|
else{
|
||||||
|
svg_rect(TEXT_WIDTH, top, bin_width, BIN_HEIGHT, BLACK, RED);
|
||||||
|
}
|
||||||
top += BIN_HEIGHT;
|
top += BIN_HEIGHT;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Ссылка в новой задаче
Block a user