KireevYP 12 месяцев назад
Родитель 97036095fa 0eb008b27e
Сommit 0bdf67a606

@ -32,7 +32,13 @@
<Add option="-Wall" />
<Add option="-fexceptions" />
</Compiler>
<Unit filename="histogram.cpp" />
<Unit filename="histogram.h" />
<Unit filename="main.cpp" />
<Unit filename="svg.cpp" />
<Unit filename="svg.h" />
<Unit filename="text.cpp" />
<Unit filename="text.h" />
<Extensions>
<lib_finder disable_auto="1" />
</Extensions>

@ -23,6 +23,7 @@ input_data(istream& in) {
in >> in1.numbers[i];
}
cerr << "Enter bin count: ";
in >> in1.bin_count;
@ -33,6 +34,7 @@ int main()
{
const size_t SCREEN_WIDTH = 80;
const size_t MAX_ASTERISK = SCREEN_WIDTH - 3 - 1;
bool prompt = true;
auto in = input_data(cin);
auto bins = make_histogram(in.numbers, in.bin_count);

@ -41,6 +41,7 @@ show_histogram_svg(const vector<double>& bins) {
const auto BLOCK_WIDTH = 10;
const auto MAX_WIDTH = (IMAGE_WIDTH - TEXT_WIDTH);
double sum = 0;
double max_count = (bins[0] * BLOCK_WIDTH);
for (double bin: bins){
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);
double top = 0;
for (double bin : bins) {
const double bin_width = MAX_WIDTH * ((BLOCK_WIDTH * bin) / max_count);
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;
}
svg_end();

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

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