code: пункт 3 разделение программы

master
Alexander (AntonovichAN) 7 месяцев назад
Родитель 6eca9d7a4f
Сommit d59cf53860

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

@ -4,3 +4,4 @@
/lab01.depend
/main.exe
/main.o
/bat

@ -0,0 +1,43 @@
#include <vector>
#include "histogram.h"
using namespace std;
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){
vector<size_t> bins ( bin_count );
double min = numbers[0];
double max = numbers[0];
find_minmax(numbers, min, max);
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;
}

@ -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 <vector>
#include "histogram.h"
using namespace std;
@ -31,45 +32,6 @@ Input 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){
vector<size_t> bins ( bin_count );
double min = numbers[0];
double max = numbers[0];
find_minmax(numbers, min, max);
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;
}
void show_histogram_text(const vector<size_t> &bins){
size_t maxbin = bins[0];
for (size_t i=1; i < bins.size(); i++){

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