Showing the changes to python (1 of 1 file). Show all
Unified · Split
| @@ -12,13 +12,16 @@ class benchpitch(bench): · 11 unmodified lines | |||
| 12 | 'Msil', 'Mpit', 'Mchr', | 12 | 'Msil', 'Mpit', 'Mchr', |
| 13 | 'TotalPit', 'TotalPit', 'TotalChr' ] | 13 | 'TotalPit', 'TotalPit', 'TotalChr' ] |
| 14 | """ list of values to print per dir """ | 14 | """ list of values to print per dir """ |
| 15 | printnames = [ 'mode', 'MinPit', 'MaxPit', 'TotalSil', 'TotalPit', 'TotalChr'] | 15 | printnames_total = [ 'mode', 'MinPit', 'MaxPit', 'TotalSil', 'TotalPit', 'TotalChr'] |
| 16 | printnames_notes = [ 'mode', 'Note', 'Sil', 'Pit', 'Chr'] | ||
| 17 | printnames = printnames_notes | ||
| 16 | 18 | ||
| 17 | """ per dir """ | 19 | """ per dir """ |
| 18 | formats = {'mode': "%12s" , | 20 | formats = {'mode': "%12s" , |
| 19 | 'truth': "%s", | 21 | 'truth': "%s", |
| 20 | 'osil': "%s", 'esil': "%s", | 22 | 'osil': "%s", 'esil': "%s", |
| 21 | 'opit': "%s", 'epit': "%s", 'echr': "%s", | 23 | 'opit': "%s", 'epit': "%s", 'echr': "%s", |
| 24 | 'Note': "%s", 'Sil': "%s", 'Chr': "%s", 'Pit': "%s", | ||
| 22 | 'TotalPit': "%s", 'TotalSil': "%s", 'TotalChr': "%s", | 25 | 'TotalPit': "%s", 'TotalSil': "%s", 'TotalChr': "%s", |
| 23 | 'MinPit': "%s", 'MaxPit': "%s", | 26 | 'MinPit': "%s", 'MaxPit': "%s", |
| 24 | 'Msil': "%s", 'Mpit': "%s", 'Mchr': "%s"} | 27 | 'Msil': "%s", 'Mpit': "%s", 'Mchr': "%s"} |
| @@ -77,12 +80,17 @@ class benchpitch(bench): · 52 unmodified lines | |||
| 77 | allMsil[i] = allEsil[i]/float(allOsil[i])*100. | 80 | allMsil[i] = allEsil[i]/float(allOsil[i])*100. |
| 78 | allMpit[i] = allEpit[i]/float(allOpit[i])*100. | 81 | allMpit[i] = allEpit[i]/float(allOpit[i])*100. |
| 79 | allMchr[i] = allEchr[i]/float(allOpit[i])*100. | 82 | allMchr[i] = allEchr[i]/float(allOpit[i])*100. |
| 83 | self.v['Sil'], self.v['Pit'], self.v['Chr'] = allMsil[i], allMpit[i], allMchr[i] | ||
| 84 | self.v['Note'] = truth[i] | ||
| 85 | #self.printnames = self.printnames_notes | ||
| 86 | self.pretty_print() | ||
| 80 | self.v['TotalSil'] = sum(allMsil)/len(truth) | 87 | self.v['TotalSil'] = sum(allMsil)/len(truth) |
| 81 | self.v['TotalPit'] = sum(allMpit)/len(truth) | 88 | self.v['TotalPit'] = sum(allMpit)/len(truth) |
| 82 | self.v['TotalChr'] = sum(allMchr)/len(truth) | 89 | self.v['TotalChr'] = sum(allMchr)/len(truth) |
| 83 | self.v['MinPit'] = min(truth) | 90 | self.v['MinPit'] = min(truth) |
| 84 | self.v['MaxPit'] = max(truth) | 91 | self.v['MaxPit'] = max(truth) |
| 85 | self.pretty_print() | 92 | #self.printnames = self.printnames_total |
| 93 | #self.pretty_print() | ||
| 86 | 94 | ||
| 87 | plot = [] | 95 | plot = [] |
| 88 | self.plotpitchtessiture(plot, | 96 | self.plotpitchtessiture(plot, |