code: вынос расчёта гистограммы в отдельный файл

main
MatusSV 12 месяцев назад
Родитель cd46e043f3
Сommit be7b291133

@ -0,0 +1,61 @@
#include "histogram.h"
using namespace std;
static void
find_minmax(const vector<double>& numbers, double& min, double& max)
{
min = numbers[0];
max = numbers[0];
// (çäåñü êîä ïîèñêà ìèíèìóìà è ìàêñèìóìà)
for (double value : numbers)
{
if (value < min) {min = value;}
else if (value > max) {max = value;}
}
}
vector<size_t>
make_histogram(const vector<double>& numbers, size_t& bin_count)
{
double min, max;
find_minmax(numbers, min, max);
double bin_size = (max - min) / bin_count;
vector<size_t> bins(bin_count);
for (size_t i = 0; i < numbers.size(); i++)
{
for (size_t j = i + 1; j < numbers.size(); j++)
{
if (numbers[i] == numbers[j])
{
//numbers.erase(numbers.begin() + j);
//number_count--;
//i--;
//cout << "Removed number " << numbers[j] << endl;
}
}
}
for (size_t i = 0; i < numbers.size(); i++)
{
bool found = false;
for (size_t j = 0; (j < bin_count - 1) && !found; j++)
{
auto low_bound = min + j * bin_size;
auto high_bound = min + (j + 1) * bin_size;
if ((low_bound <= numbers[i]) && (numbers[i] < high_bound))
{
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

@ -1,5 +1,6 @@
#include <iostream> #include <iostream>
#include <vector> #include <vector>
#include "histogram.h"
using namespace std; using namespace std;
@ -28,63 +29,6 @@ input_data() {
return in; return in;
} }
void
find_minmax(const vector<double>& numbers, double& min, double& max) {
min = numbers[0];
max = numbers[0];
// (çäåñü êîä ïîèñêà ìèíèìóìà è ìàêñèìóìà)
for (double value : numbers)
{
if (value < min) {min = value;}
else if (value > max) {max = value;}
}
}
vector<size_t>
make_histogram(const vector<double>& numbers, size_t& bin_count)
{
double min, max;
find_minmax(numbers, min, max);
double bin_size = (max - min) / bin_count;
vector<size_t> bins(bin_count);
for (size_t i = 0; i < numbers.size(); i++)
{
for (size_t j = i + 1; j < numbers.size(); j++)
{
if (numbers[i] == numbers[j])
{
//numbers.erase(numbers.begin() + j);
//number_count--;
//i--;
//cout << "Removed number " << numbers[j] << endl;
}
}
}
for (size_t i = 0; i < numbers.size(); i++)
{
bool found = false;
for (size_t j = 0; (j < bin_count - 1) && !found; j++)
{
auto low_bound = min + j * bin_size;
auto high_bound = min + (j + 1) * bin_size;
if ((low_bound <= numbers[i]) && (numbers[i] < high_bound))
{
bins[j]++;
found = true;
}
}
if (!found)
{
bins[bin_count - 1]++;
}
}
return bins;
}
void void
show_histogram_text(const vector<size_t>& bins, size_t& bin_count) { show_histogram_text(const vector<size_t>& bins, size_t& bin_count) {
const size_t SCREEN_WIDTH = 80; const size_t SCREEN_WIDTH = 80;

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