diff --git a/main.cpp b/main.cpp index c8529f0..3472e06 100644 --- a/main.cpp +++ b/main.cpp @@ -45,33 +45,35 @@ void find_minmax(const vector &numbers, double &min, double &max){ } } -int main(){ - - Input in = input_data(); - - vector bins ( in.bin_count ); - double min = in.numbers[0]; - double max = in.numbers[0]; - - find_minmax(in.numbers, min, max); - - - double bin_size = ( max - min ) / in.bin_count; - for (size_t i=0; i < in.numbers.size(); i++ ){ +vector make_histogram(const vector &numbers, size_t bin_count) { + double min = numbers[0]; + double max = numbers[0]; + find_minmax(numbers, min, max); + double bin_size = ( max - min ) / bin_count; + vector bins ( bin_count ); + for (size_t i=0; i < numbers.size(); i++ ){ bool found = false; - for (size_t j = 0; ( j < in.bin_count - 1 ) && !found; j++ ){ + 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 <= in.numbers[i] && ( in.numbers[i] < hi )){ + if (lo <= numbers[i] && ( numbers[i] < hi )){ bins[j]++; found = true; } } if ( !found ){ - bins[in.bin_count-1]++; + bins[bin_count-1]++; } } - // + return bins; +} + +int main(){ + + Input in = input_data(); + + auto bins = make_histogram(in.numbers, in.bin_count); + size_t maxbin = bins[0]; for (size_t i=1; i < in.bin_count; i++){ if (maxbin < bins[i]){