justuser-31/ss14_chemistry_site
1
0
Fork 0
mirror of https://github.com/Justuser3310/ss14_chemistry_site.git synced 2025-02-08 09:07:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

Исправлено переполнение объёма

Browse Source
This commit is contained in:
none 2024-01-28 10:31:20 +03:00
parent 51023cd897
commit 944eeb0d0b
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
calc.py
View File

@ -12,7 +12,7 @@ def sround(num):
num = floor(num) num = floor(num)
# Подмены # Подмены
rep = [[16,15], [33,30], [21,20], [12,10], [8,5]] rep = [[16,15], [33,30], [21,20], [12,10], [8,5], [6,5]]
for i in rep: for i in rep:
if num == i[0]: if num == i[0]:
@ -34,9 +34,17 @@ def calc(el, amount, main = False):
parts += i[1] parts += i[1]
# Делаем поправку на выход # Делаем поправку на выход
if out < parts: while out < parts:
# Предварительная часть
part = sround(amount/parts)
print(el, ': ',out,' < ', parts) print(el, ': ',out,' < ', parts)
parts = out # Если итоговый объём <= входного объёма
if (parts+1)*part <= amount:
parts += 1
else:
break
# parts = out
# Считаем 1 часть # Считаем 1 часть
part = sround(amount/parts) part = sround(amount/parts)