TerekhovFV 1 год назад
Родитель e84b8a5e33
Сommit d194f2a300

6
.gitignore поставляемый

@ -0,0 +1,6 @@
/bin
/obj
/project.layout
/project.depend
/unittest.depend
/unittest.layout

@ -0,0 +1,51 @@
#include "histogram.h"
vector <size_t>
make_histogram(const vector<double>& numbers, size_t & bin_count, size_t & number_count, size_t & max_count) {
double min, max;
find_minmax(numbers, min, max);
double bin_size = (max - min) / bin_count;
vector<size_t> bins(bin_count);
max_count = bins[0];
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 (bins[j] > max_count){
max_count = bins[j];
}
}
if (!found){
bins[bin_count - 1]++;
}
if (bins[bin_count - 1] > max_count){
max_count = bins[bin_count - 1];
}
}
return bins;
}
void
find_minmax(const vector<double>& numbers, double& min, double& max) {
if (!numbers.empty()) {
min = numbers[0];
max = numbers[0];
} else {
min = 0;
max = 0;
}
for (double x : numbers)
{
if (x < min){
min = x;
}
else if (x > max){
max = x;
}
}
}

@ -0,0 +1,14 @@
#ifndef HISTOGRAM_H_INCLUDED
#define HISTOGRAM_H_INCLUDED
#include <vector>
using namespace std;
vector<size_t>
make_histogram(const vector<double>& numbers, size_t & bin_count, size_t & number_count, size_t & max_count);
void
find_minmax(const vector<double>& numbers, double& min, double& max);
#endif // HISTOGRAM_H_INCLUDED

@ -0,0 +1,8 @@
#ifndef HISTOGRAM_INTERNAL_H_INCLUDED
#define HISTOGRAM_INTERNAL_H_INCLUDED
#include <vector>
void
find_minmax(const std::vector<double>& numbers, double& min, double& max);
#endif // HISTOGRAM_INTERNAL_H_INCLUDED

@ -1,6 +1,8 @@
#include <iostream>
#include <vector>
#include "histogram.h"
#include "svg.h"
#include "text.h"
using namespace std;
@ -33,85 +35,11 @@ input_data() {
return in;
}
void
find_minmax(const vector<double>& numbers, double& min, double& max) {
min = numbers[0];
max = numbers[0];
for (double x : numbers)
{
if (x < min){
min = x;
}
else if (x > max){
max = x;
}
}
}
vector <size_t>
make_histogram(const vector<double>& numbers, size_t & bin_count, size_t & number_count, size_t & max_count) {
double min, max;
find_minmax(numbers, min, max);
double bin_size = (max - min) / bin_count;
vector<size_t> bins(bin_count);
max_count = bins[0];
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 (bins[j] > max_count){
max_count = bins[j];
}
}
if (!found){
bins[bin_count - 1]++;
}
if (bins[bin_count - 1] > max_count){
max_count = bins[bin_count - 1];
}
}
return bins;
}
void
show_histogram_text(vector<size_t>& bins, size_t & max_count,size_t & bin_count){
const size_t SCREEN_WIDTH = 80;
const size_t MAX_ASTERISK = SCREEN_WIDTH - 3 - 1;
if (max_count > MAX_ASTERISK){
vector<size_t> hights(bin_count);
for (size_t i = 0; i < bin_count; i++){
size_t height = MAX_ASTERISK * (static_cast<double>(bins[i]) / max_count);
hights[i] = height;
}
for (size_t i = 0; i < bin_count; i++){
printf("%3d|", bins[i]);
for (size_t j = 0; j < hights[i]; j++){
cout<<"*";
}
cout << endl;
}
}
else{
for (size_t i = 0; i < bin_count; i++)
{
printf("%3d|", bins[i]);
for (size_t j = 0; j < bins[i]; j++){
cout<<"*";
}
cout << endl;
}
}
}
int main()
{
auto in = input_data();
auto bins = make_histogram(in.numbers, in.bin_count, in.number_count, in.max_count);
show_histogram_text(bins, in.max_count, in.bin_count);
Input in = input_data();
vector<size_t> bins = make_histogram(in.numbers, in.bin_count, in.number_count, in.max_count);
show_histogram_svg(bins);
return 0;
}

@ -41,6 +41,11 @@
<Option target="&lt;{~None~}&gt;" />
</Unit>
<Unit filename="main.cpp" />
<Unit filename="show_svg.cpp" />
<Unit filename="svg.cpp" />
<Unit filename="svg.h">
<Option target="&lt;{~None~}&gt;" />
</Unit>
<Unit filename="text.cpp" />
<Unit filename="text.h">
<Option target="&lt;{~None~}&gt;" />

@ -0,0 +1,38 @@
#include "svg.h"
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;
size_t longest;
if (!bins.empty()) {
longest = bins[0];
} else {
longest = 0;
}
for (size_t bin : bins) {
if (bin > longest) {
longest = bin;
}
}
for (size_t bin : bins) {
const double bin_width = BLOCK_WIDTH * bin;
if (bin == longest){
svg_text(TEXT_LEFT, top + TEXT_BASELINE, to_string(bin));
svg_rect(TEXT_WIDTH, top, IMAGE_WIDTH - TEXT_WIDTH, BIN_HEIGHT, "#000000", "#ff00a2");
top += BIN_HEIGHT;
} else{
svg_text(TEXT_LEFT, top + TEXT_BASELINE, to_string(bin));
svg_rect(TEXT_WIDTH, top, bin_width, BIN_HEIGHT, "#000000", "#ff00a2");
top += BIN_HEIGHT;
}
}
svg_end();
}

@ -0,0 +1,30 @@
#include <iostream>
#include <vector>
#include <string>
#include "svg.h"
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
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 <<"' />";
}

13
svg.h

@ -0,0 +1,13 @@
#ifndef SVG_H_INCLUDED
#define SVG_H_INCLUDED
#include <vector>
#include <iostream>
using namespace std;
void svg_begin(double width, double height);
void svg_end();
void svg_text(double left, double baseline, string text);
void svg_rect(double x, double y, double width, double height, string stroke = "black", string fill = "black");;
#endif // SVG_H_INCLUDED

@ -0,0 +1,35 @@
#include "text.h"
#include <cstdio>
#include <iostream>
using namespace std;
void
show_histogram_text(vector<size_t>& bins, size_t & max_count,size_t & bin_count){
const size_t SCREEN_WIDTH = 80;
const size_t MAX_ASTERISK = SCREEN_WIDTH - 3 - 1;
if (max_count > MAX_ASTERISK){
vector<size_t> hights(bin_count);
for (size_t i = 0; i < bin_count; i++){
size_t height = MAX_ASTERISK * (static_cast<double>(bins[i]) / max_count);
hights[i] = height;
}
for (size_t i = 0; i < bin_count; i++){
printf("%3d|", bins[i]);
for (size_t j = 0; j < hights[i]; j++){
cout<<"*";
}
cout << endl;
}
}
else{
for (size_t i = 0; i < bin_count; i++)
{
printf("%3d|", bins[i]);
for (size_t j = 0; j < bins[i]; j++){
cout<<"*";
}
cout << endl;
}
}
}

@ -0,0 +1,11 @@
#ifndef SHOW-SVG_H_INCLUDED
#define SHOW-SVG_H_INCLUDED
#include <vector>
using namespace std;
void
show_histogram_svg(const vector<size_t>& bins);
#endif // SHOW-SVG_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,40 @@
#define DOCTEST_CONFIG_NO_MULTITHREADING
#define DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN
#include "doctest.h"
#include "histogram_internal.h"
TEST_CASE("distinct positive numbers") {
double min = 0;
double max = 0;
find_minmax({}, min, max);
CHECK(min == 0);
CHECK(max == 0);
}
TEST_CASE("distinct positive numbers") {
double min = 0;
double max = 0;
find_minmax({1, 2}, min, max);
CHECK(min == 1);
CHECK(max == 2);
}
TEST_CASE("distinct positive numbers") {
double min = 0;
double max = 0;
find_minmax({1}, min, max);
CHECK(min == 1);
CHECK(max == 1);
}
TEST_CASE("distinct positive numbers") {
double min = 0;
double max = 0;
find_minmax({1,1,1,1,1,1,1,1,1}, min, max);
CHECK(min == 1);
CHECK(max == 1);
}
TEST_CASE("distinct positive numbers") {
double min = 0;
double max = 0;
find_minmax({-1.5,-2,-3,-4}, min, max);
CHECK(min == -4);
CHECK(max == -1.5);
}
Загрузка…
Отмена
Сохранить