Sulley
/
TraSCA
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Add to string funciton

This commit is contained in:
Gregory Trullemans 2022-12-29 12:21:03 +01:00
parent 19493536e0
commit 232b713192
2 changed files with 16 additions and 75 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

85
analyse.py
View File

@ -144,6 +144,7 @@ class RoutineStatistics:
for routine in self.routines: for routine in self.routines:
if not routine.is_complete: if not routine.is_complete:
number_of_unfinished_routine += 1 number_of_unfinished_routine += 1
print("Routine non complète")
return number_of_unfinished_routine return number_of_unfinished_routine
def get_score(self): def get_score(self):
@ -473,16 +474,16 @@ def write_twistingin_statistics(worksheet, stats, index) -> int:
def write_skill_statistics(worksheet, stats, index) -> int: def write_skill_statistics(worksheet, stats, index) -> int:
# Headers # Headers
write_header(worksheet, "K1", "Skill") write_header(worksheet, "G1", "Skill")
write_header(worksheet, "L1", "# Apparition") write_header(worksheet, "H1", "# Apparition")
write_header(worksheet, "M1", "% Apparition") write_header(worksheet, "I1", "% Apparition")
line = 2 line = 2
for key, value in stats.skills_dict.items(): for key, value in stats.skills_dict.items():
worksheet["K" + str(line)] = str(key) worksheet["G" + str(line)] = str(key)
worksheet["L" + str(line)] = value worksheet["H" + str(line)] = value
write_percentage_cell( write_percentage_cell(
worksheet, "M" + str(line), value / stats.number_of_routine worksheet, "I" + str(line), value / stats.number_of_routine
) )
line += 1 line += 1
@ -498,9 +499,9 @@ def write_skill_statistics(worksheet, stats, index) -> int:
# worksheet.add_table(tab) # worksheet.add_table(tab)
worksheet.conditional_formatting.add( worksheet.conditional_formatting.add(
"M2:M" + str(line), stats.table_conditionnal_format "I2:I" + str(line), stats.table_conditionnal_format
) )
worksheet.auto_filter.ref = "K1:M" + str(line) worksheet.auto_filter.ref = "G1:I" + str(line)
return index return index
@ -619,8 +620,7 @@ def combinaison_frequency(routine_list, stats, filename) -> None:
if __name__ == "__main__": if __name__ == "__main__":
if len(sys.argv) < 2: if len(sys.argv) < 2: # use clize ?
# use clize ?
print("Please, give a XLSX file.") print("Please, give a XLSX file.")
exit() exit()
@ -637,68 +637,3 @@ if __name__ == "__main__":
stats = RoutineStatistics(routine_list) stats = RoutineStatistics(routine_list)
skill_frequency(routine_list, stats, filename) skill_frequency(routine_list, stats, filename)
combinaison_frequency(routine_list, stats, filename) combinaison_frequency(routine_list, stats, filename)
# for routine in routine_list:
# print('')
# print('')
# print('--------------------------------------')
# tmp = routine.get_score()
# print('Diff = ' + str(tmp))
# # print('')
# # print('EN AVANT IN')
# tmp = routine.get_number_of_skill_with_direction_and_twisting_in(direction=FRONTWARD, twist_quantity=0)
# # print("Avant + 0/2 : " + str(tmp))
# tmp = routine.get_number_of_skill_with_direction_and_twisting_in(direction=FRONTWARD, twist_quantity=1)
# # print("Avant + 1/2 : " + str(tmp))
# tmp = routine.get_number_of_skill_with_direction_and_twisting_in(direction=FRONTWARD, twist_quantity=2)
# # print("Avant + 2/2 : " + str(tmp))
# tmp = routine.get_number_of_skill_with_direction_and_twisting_in(direction=FRONTWARD, twist_quantity=3)
# # print("Avant + 3/2 : " + str(tmp))
# tmp = routine.get_number_of_skill_with_direction_and_twisting_in(direction=FRONTWARD, twist_quantity=4)
# # print("Avant + 4/2 : " + str(tmp))
# tmp = routine.get_number_of_skill_with_direction_and_twisting_in(direction=FRONTWARD, twist_quantity=5)
# # print("Avant + 5/2 : " + str(tmp))
# # print('')
# # print('')
# # print('EN ARRIERE IN')
# tmp = routine.get_number_of_skill_with_direction_and_twisting_in(direction=BACKWARD, twist_quantity=0)
# # print("Arrière + 0/2 : " + str(tmp))
# tmp = routine.get_number_of_skill_with_direction_and_twisting_in(direction=BACKWARD, twist_quantity=1)
# # print("Arrière + 1/2 : " + str(tmp))
# tmp = routine.get_number_of_skill_with_direction_and_twisting_in(direction=BACKWARD, twist_quantity=2)
# # print("Arrière + 2/2 : " + str(tmp))
# tmp = routine.get_number_of_skill_with_direction_and_twisting_in(direction=BACKWARD, twist_quantity=3)
# # print("Arrière + 3/2 : " + str(tmp))
# tmp = routine.get_number_of_skill_with_direction_and_twisting_in(direction=BACKWARD, twist_quantity=4)
# # print("Arrière + 4/2 : " + str(tmp))
# # print('')
# # print('')
# # print('')
# # print('')
# # print('')
# # print('EN AVANT OUT')
# tmp = routine.get_number_of_skill_with_direction_and_twisting_out(direction=FRONTWARD, twist_quantity=0)
# # print("Avant + 0/2 : " + str(tmp))
# tmp = routine.get_number_of_skill_with_direction_and_twisting_out(direction=FRONTWARD, twist_quantity=1)
# # print("Avant + 1/2 : " + str(tmp))
# tmp = routine.get_number_of_skill_with_direction_and_twisting_out(direction=FRONTWARD, twist_quantity=2)
# # print("Avant + 2/2 : " + str(tmp))
# tmp = routine.get_number_of_skill_with_direction_and_twisting_out(direction=FRONTWARD, twist_quantity=3)
# # print("Avant + 3/2 : " + str(tmp))
# tmp = routine.get_number_of_skill_with_direction_and_twisting_out(direction=FRONTWARD, twist_quantity=4)
# # print("Avant + 4/2 : " + str(tmp))
# tmp = routine.get_number_of_skill_with_direction_and_twisting_out(direction=FRONTWARD, twist_quantity=5)
# # print("Avant + 5/2 : " + str(tmp))
# # print('')
# # print('')
# # print('EN ARRIERE OUT')
# tmp = routine.get_number_of_skill_with_direction_and_twisting_out(direction=BACKWARD, twist_quantity=0)
# # print("Arrière + 0/2 : " + str(tmp))
# tmp = routine.get_number_of_skill_with_direction_and_twisting_out(direction=BACKWARD, twist_quantity=1)
# # print("Arrière + 1/2 : " + str(tmp))
# tmp = routine.get_number_of_skill_with_direction_and_twisting_out(direction=BACKWARD, twist_quantity=2)
# # print("Arrière + 2/2 : " + str(tmp))
# tmp = routine.get_number_of_skill_with_direction_and_twisting_out(direction=BACKWARD, twist_quantity=3)
# # print("Arrière + 3/2 : " + str(tmp))
# tmp = routine.get_number_of_skill_with_direction_and_twisting_out(direction=BACKWARD, twist_quantity=4)
# # print("Arrière + 4/2 : " + str(tmp))

6
routine.py
View File

@ -15,6 +15,12 @@ class Routine:
def __init__(self): def __init__(self):
self.skills = [] self.skills = []
def __str__(self):
routine = ""
for skill in self.skills:
routine += f" - {skill.numeric_code}"
return routine[5:]
def add_skill(self, skill): def add_skill(self, skill):
self.skills.append(skill) self.skills.append(skill)