diff --git a/main.cpp b/main.cpp index 3472e06..5230b55 100644 --- a/main.cpp +++ b/main.cpp @@ -68,20 +68,15 @@ vector make_histogram(const vector &numbers, size_t bin_count) { return bins; } -int main(){ - - Input in = input_data(); - - auto bins = make_histogram(in.numbers, in.bin_count); - +void show_histogram_text(const vector &bins){ size_t maxbin = bins[0]; - for (size_t i=1; i < in.bin_count; i++){ + for (size_t i=1; i < bins.size(); i++){ if (maxbin < bins[i]){ maxbin = bins[i]; } } if (maxbin <=MAX_ASTERISK){ - for ( size_t i=0; i < in.bin_count; i++ ){ + for ( size_t i=0; i < bins.size(); i++ ){ if ((bins[i] < 1000)&&(bins[i] > 99)){ cout << bins[i] << "|"; for ( size_t j=0; j < bins[i]; j++ ){ @@ -103,7 +98,7 @@ int main(){ } } } else { - for (size_t i=0; i < in.bin_count; i++){ + for (size_t i=0; i < bins.size(); i++){ size_t heightG= MAX_ASTERISK * (static_cast(bins[i]) / maxbin); if ((bins[i] < 1000)&&(bins[i] > 99)){ cout << bins[i] << "|"; @@ -126,4 +121,15 @@ int main(){ } } } +} + +int main(){ + + Input in = input_data(); + + auto bins = make_histogram(in.numbers, in.bin_count); + + show_histogram_text(bins); + + }