Commit a8f5a746 authored by Mathieu Valois's avatar Mathieu Valois
Browse files

cleaner output formating

parent bd918040

src/core/Statistics.cpp

+10 −13
Original line number Diff line number Diff line
@@ -72,21 +72,18 @@ bool Statistics::operator==(const Statistics& o) const { 


std::ostream& operator<<(std::ostream& os, const Statistics& results){

	float perc = percentage(results.total_filter, results.total_counter);

	minMax m = results.minMaxValue;



	os << "\nSelected " << results.total_filter << " on " << results.total_counter << " passwords\t("

		<< perc << " %)" << endl;

	os << "Processed " << results.total_filter << " on " << results.total_counter << " passwords (" << perc << " %)" << endl;



	perc = percentage(results.nb_secure_passwords, results.total_counter);

	os << "\n\t\t--> " << results.nb_secure_passwords << " passwords\t(" << perc << " %) respect the security rules\n" << endl;



	os << "\nmin - max\n" << endl;

	os << setw(43) << right << "digit:  "

			<< setw(2) << right << results.minMaxValue.mindigit << " - " << results.minMaxValue.maxdigit << endl;

	os << setw(43) << right << "lower:  "

			<< setw(2) << right << results.minMaxValue.minlower << " - " << results.minMaxValue.maxlower << endl;

	os << setw(43) << right << "upper:  "

			<< setw(2) << right << results.minMaxValue.minupper << " - " << results.minMaxValue.maxupper << endl;

	os << setw(43) << right << "special:  "

			<< setw(2) << right << results.minMaxValue.minspecial << " - " << results.minMaxValue.maxspecial << endl;



	os << setw(42) << "--> " << results.nb_secure_passwords << " passwords (" << perc << " %) respect the security rules" << endl;

	os << endl;

	os << "min - max" << endl;

	os << setw(42)  << "digit:  "   << m.mindigit   << " - " << m.maxdigit   << endl;

	os << setw(42)  << "lower:  "   << m.minlower   << " - " << m.maxlower   << endl;

	os << setw(42)  << "upper:  "   << m.minupper   << " - " << m.maxupper   << endl;

	os << setw(42)  << "special:  " << m.minspecial << " - " << m.maxspecial << endl;

	return os;

}
 
 No newline at end of file

src/core/Statsgen.cpp

+4 −4
Original line number Diff line number Diff line
@@ -79,14 +79,14 @@ void Statsgen::print_stats() const { 
	cout << settings.sr << endl;

	cout << results << endl;



	cout << "\nStatistics relative to length: \n" << endl;

	cout << endl << "Statistics relative to length: " << endl;

	showMap(results.length, settings.top, results.total_counter, settings.hiderare, count);



	cout << "\nStatistics relative to charsets: \n" << endl;

	cout << endl << "Statistics relative to charsets: " << endl;

	showMap(results.charactersets, -1, results.total_counter, settings.hiderare, count);





	cout << "\nStatistics relative to simplemasks: \n" << endl;

	cout << endl << "Statistics relative to simplemasks: " << endl;

	showMap(results.simplemasks, settings.top, results.total_counter, settings.hiderare, count);



	if (settings.limitSimplemask > 0) {
@@ -98,7 +98,7 @@ void Statsgen::print_stats() const { 
	}





	cout << "\nStatistics relative to advancedmask: \n" << endl;

	cout << endl << "Statistics relative to advancedmask: " << endl;

	showMap(results.advancedmasks, settings.top, results.total_counter, settings.hiderare, count);



	if (! settings.outfile_name.empty()){