Сравнить коммиты

..

4 Коммитов

Автор SHA1 Сообщение Дата
SmirnovFA
161fd910f1 code: point 4.1 took out the make_histogram and find_minmax functionsЭ 2024-06-05 03:49:49 +03:00
SmirnovFA
6cd71782fd code: point 2 add show_histogramm_text 2024-06-05 03:38:05 +03:00
SmirnovFA
17deb398d5 code: point 2 add make_histogramm 2024-06-05 03:29:10 +03:00
SmirnovFA
faa5b7af4e code: point 2 add find_minmax 2024-06-05 02:23:18 +03:00
3 изменённых файлов: 91 добавлений и 45 удалений

50
histogram.cpp Обычный файл
Просмотреть файл

@@ -0,0 +1,50 @@
#include <iostream>
#include <vector>
using namespace std;
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<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;
}

9
histogram.h Обычный файл
Просмотреть файл

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

Просмотреть файл

@@ -1,11 +1,16 @@
#include <iostream>
#include <vector>
#include "histogram.h"
using namespace std;
struct Input {
const size_t SCREEN_WIDTH = 80;
const size_t MAX_ASTERISK = SCREEN_WIDTH - 3 - 1;
struct
Input {
vector<double> numbers;
size_t bin_count{};
int bin_count{};
};
Input
@@ -17,49 +22,21 @@ input_data(){
for (size_t i = 0; i < number_count; i++) {
cin >> in.numbers[i];
}
size_t bin_count;
cin >> bin_count;
int bin_count;
cin >> in.bin_count;
return in;
}
int main()
{
Input in = input_data();
void
show_histogramm_text(vector<int> bins, vector<double> numbers, size_t bin_count){
double min = numbers[0];
double max = numbers[0];
for (double x : numbers)
{
if (x < min)
{
min = x;
}
else if (x > max)
{
max = x;
size_t max_count;
for (int i =0; i<bin_count;i++){
if (numbers[i]>max_count){
max_count=numbers[i];
}
}
double bin_size = (max - min) / bin_count;
for (size_t i = 0; i < number_count; 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]++;
}
}
for (int i =0; i<bin_count;i++){
if (bins[i]>max_count){
@@ -67,28 +44,26 @@ int main()
}
}
//*cout<<max_count<<endl;
if (max_count>MAX_ASTERISK){
for (int i=0; i<bin_count; i++){
size_t height = MAX_ASTERISK * (static_cast<double>(bins[i]) / max_count);
if (bins[i]<10){
cout<<" "<<bins[i]<<"|";
for (int j=0;j<height;j++){
for (int j=0;j<bins[i];j++){
cout<<"*";
}
cout<<endl;
}
else if(bins[i]<100){
cout<<" "<<bins[i]<<"|";
for (int j=0;j<height;j++){
for (int j=0;j<bins[i];j++){
cout<<"*";
}
cout<<endl;
}
else{
cout<<bins[i]<<"|";
for (int j=0;j<height;j++){
for (int j=0;j<bins[i];j++){
cout<<"*";
}
cout<<endl;
@@ -121,4 +96,16 @@ int main()
}
}
}
}
int
main()
{
auto in = input_data();
auto bins = make_histogram(in.numbers, in.bin_count);
show_histogramm_text(bins, in.numbers, in.bin_count);
}