sander/rowsandall
Private
Public Access
1
0
Fork 0
Code Activity

for nested repeat loops

Browse Source
This commit is contained in:
Sander Roosendaal
2021-03-16 14:08:35 +01:00
parent 73211415b3
commit 736ea040a9
1 changed files with 20 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
rowers/utils.py
View File

@@ -707,6 +707,7 @@ def ps_dict_order(d):
'meters': meters, 'meters': meters,
} }
sdict2 = collections.OrderedDict(reversed(list(sdict.items()))) sdict2 = collections.OrderedDict(reversed(list(sdict.items())))
for step in steps: for step in steps:
@@ -746,12 +747,25 @@ def ps_dict_order(d):
sdict3.append(item) sdict3.append(item)
totalmeters += factor*item['meters'] totalmeters += factor*item['meters']
totalseconds += factor*item['seconds'] totalseconds += factor*item['seconds']
if len(holduntil)>0 and item['stepID'] == holduntil[-1]: if len(holduntil)>0 and item['stepID'] <= holduntil[-1]:
sdict3.append(hold.pop()) if item['stepID'] == holduntil[-1]:
factor /= multiplier.pop() sdict3.append(hold.pop())
spaces = spaces[:-18] factor /= multiplier.pop()
holduntil.pop() spaces = spaces[:-18]
holduntil.pop()
else:
prevstep = sdict3.pop()
prevstep['string'] = prevstep['string'][18:]
prevprevstep = sdict3.pop()
prevprevstep['string'] = spaces+prevprevstep['string']
sdict3.append(prevprevstep)
curstep = hold.pop()
curstep['string'] = curstep['string']
sdict3.append(curstep)
factor /= multiplier.pop()
sdict3.append(prevstep)
holduntil.pop()
spaces = spaces[:-18]
sdict = list(reversed(sdict3)) sdict = list(reversed(sdict3))