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

..

Ничего общего в коммитах. 'ebd84a605348c4fc21c2bf5bc45d85cda340b001' и 'a80c85ec3d198be237171eff6a2ccfd0c6a8f7cf' имеют совершенно разные истории.

@ -6,33 +6,26 @@ const size_t MAX_ASTERISK = SCREEN_WIDTH - 3 - 1;
using namespace std; using namespace std;
int main()
{
size_t number_count, bin_count, max_count;
struct Input { cerr << "Enter number count: ";
vector<double> numbers;
size_t bin_count{};
size_t number_count{};
};
Input
input_data() {
size_t number_count;
cin >> number_count; cin >> number_count;
Input in;
in.numbers.resize(number_count);
vector<double> numbers(number_count); vector<double> numbers(number_count);
for (size_t i = 0; i < number_count; i++) {
cin >> in.numbers[i]; cerr << "Enter numbers: ";
for (size_t i = 0; i < number_count; i++){
cin >> numbers[i];
} }
size_t bin_count; cerr << "Enter bin count: ";
cin >> in.bin_count; cin >> bin_count;
return in;
} double min = numbers[0];
double max = numbers[0];
void
find_minmax(const vector<double>& numbers, double& min, double& max) {
min = numbers[0];
for (double x : numbers) { for (double x : numbers) {
if (x < min) { if (x < min) {
min = x; min = x;
@ -41,15 +34,13 @@ find_minmax(const vector<double>& numbers, double& min, double& max) {
max = x; max = x;
} }
} }
}
vector<size_t> make_histogram(const vector<double> numbers, size_t bin_count){
vector<size_t> bins(bin_count); vector<size_t> bins(bin_count);
double max, min = 0; vector<size_t> procent(bin_count);
find_minmax(numbers, min, max);
double bin_size = (max - min) / bin_count; double bin_size = (max - min) / bin_count;
for (size_t i = 0; i < numbers.size(); i++) { for (size_t i = 0; i < number_count; i++) {
bool found = false; bool found = false;
for (size_t j = 0; (j < bin_count - 1) && !found; j++) { for (size_t j = 0; (j < bin_count - 1) && !found; j++) {
auto lo = min + j * bin_size; auto lo = min + j * bin_size;
@ -61,14 +52,8 @@ vector<size_t> make_histogram(const vector<double> numbers, size_t bin_count){
} }
if (!found) { if (!found) {
bins[bin_count - 1]++; bins[bin_count - 1]++;
} }
} }
return bins;
}
vector<size_t> make_histogram_proc(const vector<double> numbers, size_t bin_count, vector<size_t> bins){
vector<size_t> procent(bin_count);
double sum = 0; double sum = 0;
for (size_t i = 0; i < bin_count; i++){ for (size_t i = 0; i < bin_count; i++){
sum = sum + bins[i]; sum = sum + bins[i];
@ -79,12 +64,9 @@ vector<size_t> make_histogram_proc(const vector<double> numbers, size_t bin_coun
ost = ost - procent[i]; ost = ost - procent[i];
} }
procent[bin_count-1]=ost; procent[bin_count-1]=ost;
return procent;
}
void show_histogram_text(vector<size_t> bins, size_t bin_count, vector<size_t> procent){
size_t max_count = 0; max_count = 0;
for (size_t x: bins) { for (size_t x: bins) {
if (x > max_count) { if (x > max_count) {
max_count = x; max_count = x;
@ -131,14 +113,5 @@ void show_histogram_text(vector<size_t> bins, size_t bin_count, vector<size_t> p
} }
} }
}
int main()
{
auto in = input_data();
auto bins = make_histogram(in.numbers, in.bin_count);
auto procent = make_histogram_proc(in.numbers, in.bin_count, bins);
show_histogram_text(bins, in.bin_count, procent);
return 0; return 0;
} }

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