code: find_minmax перестала быть статичной, добавлены histogram_internal.h, unittest.cbp и doctest.h

master
Zakhar 7 месяцев назад
Родитель 1795647c65
Сommit 813f6a0827

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

@ -1,4 +1,5 @@
cs-lab34.cbp
cs-lab34.depend
unittest.cbp
/bin
/obj

Разница между файлами не показана из-за своего большого размера Загрузить разницу

@ -0,0 +1,37 @@
#include "histogram.h"
#include <vector>
void find_minmax(const std::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;
}
}
}
std::vector<std::size_t> make_histogram(const std::vector<double> &numbers, std::size_t bin_count) {
double min = numbers[0];
double max = numbers[0];
find_minmax(numbers, min, max);
double bin_size = ( max - min ) / bin_count;
std::vector<std::size_t> bins ( bin_count );
for (std::size_t i=0; i < numbers.size(); i++ ){
bool found = false;
for (std::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]++;
}
}
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,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

@ -0,0 +1,45 @@
#include <iostream>
#include <vector>
#include "text.h"
const std::size_t SCREEN_WIDTH = 80;
const std::size_t MAX_ASTERISK = SCREEN_WIDTH - 3 - 1;
void show_histogram_text(const std::vector<std::size_t> &bins){
std::size_t maxbin = bins[0];
for (std::size_t i=1; i < bins.size(); i++){
if (maxbin < bins[i]){
maxbin = bins[i];
}
}
if (maxbin <= MAX_ASTERISK){
for (size_t i=0; i < bins.size(); i++ ){
if (bins[i] < 10 ){
std::cout << " " << bins[i] << "|";
} else if (bins[i] < 100) {
std::cout << " " << bins[i] << "|";
} else if (bins[i] < 1000) {
std::cout << bins[i] << "|";
}
for (size_t j=0; j < bins[i]; j++ ){
std::cout << "*";
}
std::cout << std::endl;
}
} else {
for (std::size_t i=0; i < bins.size(); i++){
std::size_t heightG= MAX_ASTERISK * (static_cast<double>(bins[i]) / maxbin);
if (bins[i] < 10 ){
std::cout << " " << bins[i] << "|";
} else if (bins[i] < 100) {
std::cout << " " << bins[i] << "|";
} else if (bins[i] < 1000) {
std::cout << bins[i] << "|";
}
for (std::size_t j=0; j < heightG; j++ ){
std::cout << "*";
}
std::cout << std::endl;
}
}
}

@ -0,0 +1,8 @@
#ifndef TEXT_H_INCLUDED
#define TEXT_H_INCLUDED
#include <vector>
void show_histogram_text(const std::vector <std::size_t> &bins);
#endif // TEXT_H_INCLUDED
Загрузка…
Отмена
Сохранить