ind: индивидуальное задание

main
KireevYP 1 год назад
Родитель 150b595895
Сommit 33fb81a6bb

@ -32,7 +32,13 @@
<Add option="-Wall" /> <Add option="-Wall" />
<Add option="-fexceptions" /> <Add option="-fexceptions" />
</Compiler> </Compiler>
<Unit filename="histogram.cpp" />
<Unit filename="main.cpp" /> <Unit filename="main.cpp" />
<Unit filename="svg.cpp" />
<Unit filename="svg.h">
<Option target="&lt;{~None~}&gt;" />
</Unit>
<Unit filename="text.cpp" />
<Extensions> <Extensions>
<lib_finder disable_auto="1" /> <lib_finder disable_auto="1" />
</Extensions> </Extensions>

@ -41,6 +41,7 @@ show_histogram_svg(const vector<double>& bins) {
const auto BLOCK_WIDTH = 10; const auto BLOCK_WIDTH = 10;
const auto MAX_WIDTH = (IMAGE_WIDTH - TEXT_WIDTH); const auto MAX_WIDTH = (IMAGE_WIDTH - TEXT_WIDTH);
double sum = 0;
double max_count = (bins[0] * BLOCK_WIDTH); double max_count = (bins[0] * BLOCK_WIDTH);
for (double bin: bins){ for (double bin: bins){
if ((bin * BLOCK_WIDTH) > max_count) { if ((bin * BLOCK_WIDTH) > max_count) {
@ -48,12 +49,24 @@ show_histogram_svg(const vector<double>& bins) {
} }
} }
for (double bin: bins){
sum = sum + (MAX_WIDTH * ((BLOCK_WIDTH * bin) / max_count));
}
double avg_width = sum/bins.size();
svg_begin(400, 300); svg_begin(400, 300);
double top = 0; double top = 0;
for (double bin : bins) { for (double bin : bins) {
const double bin_width = MAX_WIDTH * ((BLOCK_WIDTH * bin) / max_count); const double bin_width = MAX_WIDTH * ((BLOCK_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, "blue", "#aaffaa"); if (bin_width > avg_width){
svg_rect(TEXT_WIDTH, top, bin_width, BIN_HEIGHT, "black", "#e71320");
}
else {
svg_rect(TEXT_WIDTH, top, bin_width, BIN_HEIGHT, "black", "#2fe713");
}
top += BIN_HEIGHT; top += BIN_HEIGHT;
} }
svg_end(); svg_end();

@ -31,6 +31,8 @@
<Compiler> <Compiler>
<Add option="-Wall" /> <Add option="-Wall" />
</Compiler> </Compiler>
<Unit filename="histogram.cpp" />
<Unit filename="unittest.cpp" />
<Extensions> <Extensions>
<lib_finder disable_auto="1" /> <lib_finder disable_auto="1" />
</Extensions> </Extensions>

Загрузка…
Отмена
Сохранить