code:добавленны изменения кода

master
Roman Ovsyannikov 4 недель назад
Родитель 9fe03ce72f
Сommit 77f57ea9f3

@ -1,5 +1,7 @@
#include <iostream>
#include <vector>
#include "histogram.h"
#include "text.h"
using namespace std;
@ -22,54 +24,7 @@ input_data(){
return in;
}
void
find_minmax(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(vector<double> numbers, int 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 (auto x: numbers) {
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 <= x) && (x < hi)) {
bins[j]++;
found = true;
}
}
if (!found) {
bins[bin_count - 1]++;
}
}
return bins;
}
void
show_histogram_text(vector<size_t> bins){
for(size_t count: bins){
if (count < 100) cout << " ";
if (count < 10) cout << " ";
cout << count << "|";
for(size_t i = 0; i < count; ++i) cout << "*";
cout << "\n";
}
}
int main()
{

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