code: point 2 add make_histogramm
Этот коммит содержится в:
58
main.cpp
58
main.cpp
@@ -6,7 +6,7 @@ using namespace std;
|
||||
struct
|
||||
Input {
|
||||
vector<double> numbers;
|
||||
size_t bin_count{};
|
||||
int bin_count{};
|
||||
};
|
||||
|
||||
Input
|
||||
@@ -18,7 +18,7 @@ input_data(){
|
||||
for (size_t i = 0; i < number_count; i++) {
|
||||
cin >> in.numbers[i];
|
||||
}
|
||||
size_t bin_count;
|
||||
int bin_count;
|
||||
cin >> in.bin_count;
|
||||
return in;
|
||||
}
|
||||
@@ -41,15 +41,43 @@ find_minmax(const std::vector<double> &numbers, double &min, double &max){
|
||||
|
||||
}
|
||||
|
||||
std::vector<int>
|
||||
make_histogram(std::vector<double> numbers, size_t bin_count){
|
||||
double min;
|
||||
double max;
|
||||
vector<int> bins(bin_count);
|
||||
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;
|
||||
}
|
||||
|
||||
int
|
||||
main()
|
||||
{
|
||||
|
||||
const size_t SCREEN_WIDTH = 80;
|
||||
const size_t MAX_ASTERISK = SCREEN_WIDTH - 3 - 1;
|
||||
Input in = input_data();
|
||||
vector<size_t> bins(in.bin_count);
|
||||
|
||||
auto in = input_data();
|
||||
auto bins = make_histogram(in.numbers, in.bin_count);
|
||||
|
||||
double min;
|
||||
double max;
|
||||
@@ -61,26 +89,7 @@ main()
|
||||
max_count=in.numbers[i];
|
||||
}
|
||||
}
|
||||
double bin_size = (max - min) / in.bin_count;
|
||||
for (size_t i = 0; i < in.numbers.size(); i++)
|
||||
{
|
||||
bool found = false;
|
||||
for (size_t j = 0; (j < in.bin_count - 1) && !found; j++)
|
||||
{
|
||||
auto lo = min + j * bin_size;
|
||||
auto hi = min + (j + 1) * bin_size;
|
||||
if ((lo <= in.numbers[i]) && (in.numbers[i] < hi))
|
||||
{
|
||||
bins[j]++;
|
||||
found = true;
|
||||
}
|
||||
|
||||
}
|
||||
if (!found)
|
||||
{
|
||||
bins[in.bin_count - 1]++;
|
||||
}
|
||||
}
|
||||
|
||||
for (int i =0; i<in.bin_count;i++){
|
||||
if (bins[i]>max_count){
|
||||
@@ -145,7 +154,6 @@ main()
|
||||
for (int i =0; i< in.bin_count;i++){
|
||||
cout<<bins[i]<<" ";
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
||||
Ссылка в новой задаче
Block a user