... | ... |
@@ -302,10 +302,13 @@ if __name__ == "__main__": |
302 | 302 |
|
303 | 303 |
start = time.time() |
304 | 304 |
for i, _ in enumerate(pool.imap_unordered(mp_correlate, comparaison.keys()), 1): |
305 |
- print('comparaisons: {:.1f}% (ETA {:s})'.format( |
|
305 |
+ found = len(comparaison) + i - tests_nbr |
|
306 |
+ print('{:s} corrélation{pluriel:s} trouvée{pluriel:s}: {:.1f}% (ETA {:s}){:s}'.format( |
|
307 |
+ ("aucune", str(found))[found > 0], |
|
306 | 308 |
i / tests_nbr * 100, |
307 | 309 |
get_ETA(start, tests_nbr, i), |
308 |
- len), |
|
310 |
+ ' ', |
|
311 |
+ pluriel = ("", "s")[found > 1]), |
|
309 | 312 |
end='\r') |
310 | 313 |
|
311 | 314 |
sys.stdout.write("\033[K") #clear line |