Сравнить коммиты
12 Коммитов
61a696c8c7
...
0b29726755
Автор | SHA1 | Дата |
---|---|---|
![]() |
0b29726755 | 1 год назад |
![]() |
906641a74f | 1 год назад |
![]() |
ce8474826d | 1 год назад |
![]() |
77f57fe873 | 1 год назад |
![]() |
4af56ed93a | 1 год назад |
![]() |
761fb65839 | 1 год назад |
![]() |
1656d4d5bb | 1 год назад |
![]() |
2069aaecb7 | 1 год назад |
![]() |
c079f176b9 | 1 год назад |
![]() |
8f349e7614 | 1 год назад |
![]() |
d6265ab68e | 1 год назад |
![]() |
d575c70356 | 1 год назад |
Разница между файлами не показана из-за своего большого размера
Загрузить разницу
@ -0,0 +1,68 @@
|
||||
#include "histogram.h"
|
||||
|
||||
using namespace std;
|
||||
|
||||
void
|
||||
find_minmax(const vector<double>& numbers, double& min, double& max, bool& empty_vector)
|
||||
{
|
||||
if (numbers.empty())
|
||||
{
|
||||
empty_vector = true;
|
||||
}
|
||||
else
|
||||
{
|
||||
min = numbers[0];
|
||||
max = numbers[0];
|
||||
for (double x : numbers)
|
||||
{
|
||||
if (x > max )
|
||||
{
|
||||
max = x;
|
||||
}
|
||||
if (x < min)
|
||||
{
|
||||
min = x;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
vector<size_t>
|
||||
make_histogram(const vector<double>& numbers, size_t& bin_count)
|
||||
{
|
||||
double min = 0;
|
||||
double max = 0;
|
||||
bool empty_vector = false;
|
||||
find_minmax(numbers, min, max, empty_vector);
|
||||
vector<size_t> bins(bin_count);
|
||||
if (empty_vector)
|
||||
{
|
||||
for (size_t y : bins)
|
||||
{
|
||||
y = 0;
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
auto bin_size = (max - min)/bin_count;
|
||||
for (double number : numbers)
|
||||
{
|
||||
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 <= number) && (number < hi))
|
||||
{
|
||||
bins[j]++;
|
||||
found = true;
|
||||
}
|
||||
}
|
||||
if (!found)
|
||||
{
|
||||
bins[bin_count - 1]++;
|
||||
}
|
||||
}
|
||||
}
|
||||
return bins;
|
||||
}
|
@ -0,0 +1,9 @@
|
||||
#ifndef HISTOGRAM_H_INCLUDED
|
||||
#define HISTOGRAM_H_INCLUDED
|
||||
|
||||
#include <vector>
|
||||
|
||||
std::vector<size_t>
|
||||
make_histogram(const std::vector<double>& numbers, size_t& bin_count);
|
||||
|
||||
#endif // HISTOGRAM_H_INCLUDED
|
@ -0,0 +1,9 @@
|
||||
#ifndef HISTOGRAM_INTERNAL_H_INCLUDED
|
||||
#define HISTOGRAM_INTERNAL_H_INCLUDED
|
||||
|
||||
#include <vector>
|
||||
|
||||
void
|
||||
find_minmax(const std::vector<double>& numbers, double& min, double& max, bool& empty_vector);
|
||||
|
||||
#endif // HISTOGRAM_INTERNAL_H_INCLUDED
|
@ -1,85 +1,36 @@
|
||||
#include <iostream>
|
||||
#include <vector>
|
||||
#include "histogram.h"
|
||||
#include "svg.h"
|
||||
|
||||
using namespace std;
|
||||
|
||||
int main()
|
||||
struct Input
|
||||
{
|
||||
vector<double> numbers;
|
||||
size_t bin_count{};
|
||||
};
|
||||
|
||||
Input
|
||||
input_data()
|
||||
{
|
||||
const size_t SCREEN_WIDTH = 80;
|
||||
const size_t MAX_ASTERISK = SCREEN_WIDTH - 3 - 1;
|
||||
size_t number_count, bin_count;
|
||||
size_t number_count;
|
||||
cerr << "Enter number count: ";
|
||||
cin >> number_count;
|
||||
vector<double> numbers(number_count);
|
||||
Input in;
|
||||
in.numbers.resize(number_count);
|
||||
for (size_t i = 0; i < number_count; i++)
|
||||
{
|
||||
cin >> numbers[i];
|
||||
cin >> in.numbers[i];
|
||||
}
|
||||
cerr << "Enter bin count: ";
|
||||
cin >> bin_count;
|
||||
vector<size_t> bins(bin_count);
|
||||
double min = numbers[0];
|
||||
double max = numbers[0];
|
||||
for (double x : numbers)
|
||||
{
|
||||
if (x < min)
|
||||
{
|
||||
min = x;
|
||||
}
|
||||
else if (x > max)
|
||||
{
|
||||
max = x;
|
||||
}
|
||||
}
|
||||
auto bin_size = (max - min)/bin_count;
|
||||
for (size_t i = 0; i < number_count; 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]++;
|
||||
}
|
||||
}
|
||||
size_t max_count = 0;
|
||||
for (size_t s = 0; s < bin_count; s++) {
|
||||
if (bins[s] > max_count)
|
||||
{
|
||||
max_count = bins[s];
|
||||
}
|
||||
}
|
||||
for (size_t bin : bins)
|
||||
{
|
||||
if (bin <100)
|
||||
{
|
||||
cout << " ";
|
||||
}
|
||||
if (bin <10)
|
||||
{
|
||||
cout << " ";
|
||||
}
|
||||
cout << bin << "|";
|
||||
if (max_count > MAX_ASTERISK) {
|
||||
size_t count = bin;
|
||||
size_t height = MAX_ASTERISK * (static_cast<double>(count) / max_count);
|
||||
for (size_t t = 0; t < height; t++)
|
||||
{
|
||||
cout << "*";
|
||||
}
|
||||
}
|
||||
else for (size_t k = 0; k < bin; k++)
|
||||
{
|
||||
cout << "*";
|
||||
}
|
||||
cout << endl;
|
||||
}
|
||||
cin >> in.bin_count;
|
||||
return in;
|
||||
}
|
||||
|
||||
int main()
|
||||
{
|
||||
Input in = input_data();
|
||||
vector<size_t> bins = make_histogram(in.numbers, in.bin_count);
|
||||
show_histogram_svg(bins);
|
||||
}
|
||||
|
@ -0,0 +1,90 @@
|
||||
#include <iostream>
|
||||
#include <string>
|
||||
#include <vector>
|
||||
#include "svg.h"
|
||||
|
||||
using namespace std;
|
||||
|
||||
bool
|
||||
check_width(double width) {
|
||||
if (width >= 3 && width <= 30)
|
||||
return true;
|
||||
else
|
||||
return false;
|
||||
}
|
||||
|
||||
void
|
||||
svg_text(double left, double baseline, string text) {
|
||||
cout << "<text x='" << left
|
||||
<< "' y='"
|
||||
<< baseline
|
||||
<< "'>" << text << "</text>";
|
||||
}
|
||||
|
||||
void
|
||||
svg_rect(double x, double y, double width, double height, string stroke = "black", string fill = "black") {
|
||||
cout << "<rect x='" << x
|
||||
<< "' y='" << y
|
||||
<< "' width='" << width
|
||||
<< "' height='" << height
|
||||
<< "' stroke='" << stroke
|
||||
<< "' fill='" << fill
|
||||
<< "' />\n";
|
||||
}
|
||||
|
||||
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
|
||||
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;
|
||||
double BLOCK_WIDTH = 0;
|
||||
const auto MAX_WIDTH = IMAGE_WIDTH - TEXT_WIDTH;
|
||||
cerr << "Enter block width: ";
|
||||
cin >> BLOCK_WIDTH;
|
||||
bool check = check_width(BLOCK_WIDTH);
|
||||
while (!check) {
|
||||
cerr << "Incorrectly enter. The block width must be >= 3px and <= 30 px. Please try again." << endl;
|
||||
cin >> BLOCK_WIDTH;
|
||||
check = check_width(BLOCK_WIDTH);
|
||||
}
|
||||
size_t max_count = 0;
|
||||
for (size_t x : bins) {
|
||||
if (x > max_count) {
|
||||
max_count = x;
|
||||
}
|
||||
}
|
||||
if (max_count == 0) {
|
||||
max_count = 1;
|
||||
}
|
||||
auto scale_factor = static_cast<double>(MAX_WIDTH) / (max_count * BLOCK_WIDTH);
|
||||
if (scale_factor > 1) {
|
||||
scale_factor = 1;
|
||||
}
|
||||
svg_begin(IMAGE_WIDTH, IMAGE_HEIGHT);
|
||||
double top = 0;
|
||||
for (size_t bin : bins) {
|
||||
double bin_width = BLOCK_WIDTH * bin * scale_factor;
|
||||
svg_text(TEXT_LEFT, top + TEXT_BASELINE, to_string(bin));
|
||||
svg_rect(TEXT_WIDTH, top, bin_width, BIN_HEIGHT);
|
||||
top += BIN_HEIGHT;
|
||||
}
|
||||
svg_end();
|
||||
}
|
@ -0,0 +1,9 @@
|
||||
#ifndef SVG_H_INCLUDED
|
||||
#define SVG_H_INCLUDED
|
||||
|
||||
#include <vector>
|
||||
|
||||
void
|
||||
show_histogram_svg(const std::vector<size_t>& bins);
|
||||
|
||||
#endif // SVG_H_INCLUDED
|
@ -0,0 +1,7 @@
|
||||
#ifndef SVG_INTERNAL_H_INCLUDED
|
||||
#define SVG_INTERNAL_H_INCLUDED
|
||||
|
||||
bool
|
||||
check_width(double width);
|
||||
|
||||
#endif // SVG_INTERNAL_H_INCLUDED
|
@ -0,0 +1,46 @@
|
||||
#include <iostream>
|
||||
#include "text.h"
|
||||
|
||||
using namespace std;
|
||||
|
||||
void
|
||||
show_histogram_text(const vector<size_t>& bins, size_t& bin_count)
|
||||
{
|
||||
const size_t SCREEN_WIDTH = 80;
|
||||
const size_t MAX_ASTERISK = SCREEN_WIDTH - 3 - 1;
|
||||
size_t max_count = 0;
|
||||
for (size_t s = 0; s < bin_count; s++)
|
||||
{
|
||||
if (bins[s] > max_count)
|
||||
{
|
||||
max_count = bins[s];
|
||||
}
|
||||
}
|
||||
if (max_count == 0)
|
||||
{
|
||||
max_count = 1;
|
||||
}
|
||||
auto scale_factor = static_cast<double>(MAX_ASTERISK) / max_count;
|
||||
if (scale_factor > 1)
|
||||
{
|
||||
scale_factor = 1;
|
||||
}
|
||||
for (size_t bin : bins)
|
||||
{
|
||||
if (bin <100)
|
||||
{
|
||||
cout << " ";
|
||||
}
|
||||
if (bin <10)
|
||||
{
|
||||
cout << " ";
|
||||
}
|
||||
cout << bin << "|";
|
||||
size_t height = bin * scale_factor;
|
||||
for (size_t t = 0; t < height; t++)
|
||||
{
|
||||
cout << "*";
|
||||
}
|
||||
cout << endl;
|
||||
}
|
||||
}
|
@ -0,0 +1,9 @@
|
||||
#ifndef TEXT_H_INCLUDED
|
||||
#define TEXT_H_INCLUDED
|
||||
|
||||
#include <vector>
|
||||
|
||||
void
|
||||
show_histogram_text(const std::vector<size_t>& bins, size_t& bin_count);
|
||||
|
||||
#endif // TEXT_H_INCLUDED
|
@ -0,0 +1,41 @@
|
||||
<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
|
||||
<CodeBlocks_project_file>
|
||||
<FileVersion major="1" minor="6" />
|
||||
<Project>
|
||||
<Option title="unittest" />
|
||||
<Option pch_mode="2" />
|
||||
<Option compiler="gcc" />
|
||||
<Build>
|
||||
<Target title="Debug">
|
||||
<Option output="bin/Debug/unittest" prefix_auto="1" extension_auto="1" />
|
||||
<Option object_output="obj/Debug/" />
|
||||
<Option type="1" />
|
||||
<Option compiler="gcc" />
|
||||
<Compiler>
|
||||
<Add option="-g" />
|
||||
</Compiler>
|
||||
</Target>
|
||||
<Target title="Release">
|
||||
<Option output="bin/Release/unittest" prefix_auto="1" extension_auto="1" />
|
||||
<Option object_output="obj/Release/" />
|
||||
<Option type="1" />
|
||||
<Option compiler="gcc" />
|
||||
<Compiler>
|
||||
<Add option="-O2" />
|
||||
</Compiler>
|
||||
<Linker>
|
||||
<Add option="-s" />
|
||||
</Linker>
|
||||
</Target>
|
||||
</Build>
|
||||
<Compiler>
|
||||
<Add option="-Wall" />
|
||||
</Compiler>
|
||||
<Unit filename="histogram.cpp" />
|
||||
<Unit filename="histogram_internal.h" />
|
||||
<Unit filename="unittest.cpp" />
|
||||
<Extensions>
|
||||
<lib_finder disable_auto="1" />
|
||||
</Extensions>
|
||||
</Project>
|
||||
</CodeBlocks_project_file>
|
@ -0,0 +1,65 @@
|
||||
#define DOCTEST_CONFIG_NO_MULTITHREADING
|
||||
#define DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN
|
||||
#include "doctest.h"
|
||||
#include "histogram_internal.h"
|
||||
#include "svg_internal.h"
|
||||
|
||||
TEST_CASE("distinct positive numbers") {
|
||||
double min = 0;
|
||||
double max = 0;
|
||||
bool empty_vector = false;
|
||||
find_minmax({1, 2}, min, max, empty_vector);
|
||||
CHECK(empty_vector == false);
|
||||
CHECK(min == 1);
|
||||
CHECK(max == 2);
|
||||
}
|
||||
|
||||
TEST_CASE("the only number") {
|
||||
double min = 0;
|
||||
double max = 0;
|
||||
bool empty_vector = false;
|
||||
find_minmax({1}, min, max, empty_vector);
|
||||
CHECK(empty_vector == false);
|
||||
CHECK(min == 1);
|
||||
CHECK(max == 1);
|
||||
}
|
||||
|
||||
TEST_CASE("negative numbers") {
|
||||
double min = 0;
|
||||
double max = 0;
|
||||
bool empty_vector = false;
|
||||
find_minmax({-1, -2}, min, max, empty_vector);
|
||||
CHECK(empty_vector == false);
|
||||
CHECK(min == -2);
|
||||
CHECK(max == -1);
|
||||
}
|
||||
|
||||
TEST_CASE("identical numbers") {
|
||||
double min = 0;
|
||||
double max = 0;
|
||||
bool empty_vector = false;
|
||||
find_minmax({2, 2}, min, max, empty_vector);
|
||||
CHECK(empty_vector == false);
|
||||
CHECK(min == 2);
|
||||
CHECK(max == 2);
|
||||
}
|
||||
|
||||
TEST_CASE("empty vector") {
|
||||
double min = 0;
|
||||
double max = 0;
|
||||
bool empty_vector = false;
|
||||
find_minmax({}, min, max, empty_vector);
|
||||
CHECK(empty_vector == true);
|
||||
CHECK(min == 0);
|
||||
CHECK(max == 0);
|
||||
}
|
||||
|
||||
TEST_CASE("correct block width") {
|
||||
bool check = check_width(23.5);
|
||||
CHECK(check == true);
|
||||
}
|
||||
|
||||
TEST_CASE("incorrect block width") {
|
||||
bool check = check_width(59);
|
||||
CHECK(check == false);
|
||||
}
|
Загрузка…
Ссылка в новой задаче