diff --git a/main.cpp b/main.cpp index 7eb0f81..7f736cf 100644 --- a/main.cpp +++ b/main.cpp @@ -1,10 +1,9 @@ #include #include #include "histogram.h" - +#include "text.h" using namespace std; -const size_t SCREEN_WIDTH = 80; -const size_t MAX_ASTERISK = SCREEN_WIDTH - 3 - 1; + struct Input { vector numbers; @@ -35,60 +34,7 @@ Input input_data() { } -void show_histogram_text(const vector &bins){ - size_t maxbin = bins[0]; - 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 < bins.size(); i++ ){ - if ((bins[i] < 1000)&&(bins[i] > 99)){ - cout << bins[i] << "|"; - for ( size_t j=0; j < bins[i]; j++ ){ - cout << "*"; - } - cout << endl; - } else if ((bins[i] < 100)&&(bins[i]>9)) { - cout << " " << bins[i] << "|"; - for ( size_t j=0; j < bins[i]; j++ ){ - cout << "*"; - } - cout << endl; - } else if ( bins[i] < 10 ){ - cout << " " << bins[i]<< "|"; - for ( size_t j=0; j < bins[i]; j++ ){ - cout << "*"; - } - cout << endl; - } - } - } else { - 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] << "|"; - for ( size_t j=0; j < heightG; j++ ){ - cout << "*"; - } - cout << endl; - } else if ((bins[i] < 100)&&(bins[i]>9)) { - cout << " " << bins[i] << "|"; - for ( size_t j=0; j < heightG; j++ ){ - cout << "*"; - } - cout << endl; - } else if ( bins[i] < 10 ){ - cout << " " << bins[i]<< "|"; - for ( size_t j=0; j < heightG; j++ ){ - cout << "*"; - } - cout << endl; - } - } - } -} + int main(){