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

..

Ничего общего в коммитах. '2633ce2005b211b4ebf3ff8b9c710bbf1358e992' и '5b43f9c1bbe23e4d72426962265dfd1c065691ff' имеют совершенно разные истории.

Разница между файлами не показана из-за своего большого размера Загрузить разницу

@ -5,25 +5,21 @@ using namespace std;
const size_t SCREEN_WIDTH = 80; const size_t SCREEN_WIDTH = 80;
const size_t MAX_ASTERISK = SCREEN_WIDTH - 3 - 1; const size_t MAX_ASTERISK = SCREEN_WIDTH - 3 - 1;
struct Input { int main()
vector<double> numbers; {
size_t bin_count{};
};
Input
input_data() {
size_t number_count; size_t number_count;
cout << "Enter number count: ";
cin >> number_count; cin >> number_count;
Input in; vector<double> numbers(number_count);
in.numbers.resize(number_count); for (int i = 0; i < number_count; i++) {
for (size_t i = 0; i < number_count; i++) { cin >> numbers[i];
cin >> in.numbers[i];
} }
cin >> in.bin_count; size_t bin_count;
return in; cout << "Enter bin count: ";
} cin >> bin_count;
void find_minmax(const vector<double>& numbers, double& min, double& max){ vector<size_t> bins(bin_count);
min = numbers[0]; double min = numbers[0];
max = numbers[0]; double max = numbers[0];
for (double x : numbers) { for (double x : numbers) {
if (x < min) { if (x < min) {
min = x; min = x;
@ -32,22 +28,13 @@ void 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)
{
double min, max;
find_minmax(numbers, min, max);
vector<size_t> bins(bin_count);
double bin_size = (max - min) / bin_count; double bin_size = (max - min) / bin_count;
for (size_t i = 0; i < number_count; i++) {
for (double num : numbers) {
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++) {
double lo = min + j * bin_size; auto lo = min + j * bin_size;
double hi = min + (j + 1) * bin_size; auto hi = min + (j + 1) * bin_size;
if (lo <= num && num < hi) { if ((lo <= numbers[i]) && (numbers[i] < hi)) {
bins[j]++; bins[j]++;
found = true; found = true;
} }
@ -56,11 +43,6 @@ vector<size_t> make_histogram(const vector<double>& numbers, size_t bin_count)
bins[bin_count - 1]++; bins[bin_count - 1]++;
} }
} }
return bins;
}
void show_histogram_text(vector<size_t> bins, size_t bin_count)
{
double max_count = bins[0]; double max_count = bins[0];
for (double x : bins) { for (double x : bins) {
if (x > max_count) { if (x > max_count) {
@ -93,12 +75,5 @@ void show_histogram_text(vector<size_t> bins, size_t bin_count)
cout << endl; cout << endl;
flag = true; flag = true;
} }
}
int main()
{
Input in = input_data();
auto bins = make_histogram(in.numbers, in.bin_count);
show_histogram_text(bins,in.bin_count);
return 0;
} }
Загрузка…
Отмена
Сохранить