промежуточный коммит

main
Фонов Александр 2 лет назад
Родитель 8c5ba0b4fc
Сommit d31a8eac77

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

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

@ -0,0 +1,12 @@
#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({1, 2}, min, max);
CHECK(min == 1);
CHECK(max == 2);
}

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

@ -1,6 +0,0 @@
#ifndef HISTOGRAM_H_INCLUDED
#define HISTOGRAM_H_INCLUDED
#include <vector>
std::vector<size_t> make_histogram(const std::vector<double> &numbers,const size_t& bin_count);
#endif

@ -1,37 +0,0 @@
#include <iostream>
#include <vector>
#include "histogram.h"
#include "text.h"
struct Input
{
std::vector<double> numbers;
size_t bin_count;
};
Input input_data()
{
size_t number_count;
std::cerr << "Enter number count: ";
std::cin >> number_count;
Input in;
in.numbers.resize(number_count);
for (size_t i = 0; i < number_count; i++)
{
std::cin >> in.numbers[i];
}
std::cerr << "Enter bin count: ";
std::cin >> in.bin_count;
return in;
}
int main()
{
Input in = input_data();
auto bins = make_histogram(in.numbers, in.bin_count);
show_histogram_text(bins, in.numbers);
return 0;
}

@ -1,41 +0,0 @@
#include "text.h"
void show_histogram_text(const std::vector<size_t> &bins, const std::vector<double> &numbers)
{
const size_t SCREEN_WIDTH = 80;
const size_t MAX_ASTERISK = SCREEN_WIDTH - 5;
size_t max_count = 0;
for (auto bin : bins)
{
if (bin > max_count)
max_count = bin;
}
for (auto bin : bins)
{
size_t height;
if (max_count <= 76)
{
height = bin;
}
else
{
height = MAX_ASTERISK * (static_cast<double>(bin) / max_count);
}
int fraction = bin * 100 / numbers.size();
if (fraction < 100)
std::cout << ' ';
if (fraction < 10)
std::cout << ' ';
std::cout << bin << "|";
for (size_t j = 0; j < height; j++)
{
std::cout << '*';
}
std::cout << std::endl;
}
}

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