From 944eeb0d0b93d9e77d421c3bbf02b5e82092b07c Mon Sep 17 00:00:00 2001
From: none <none>
Date: Sun, 28 Jan 2024 10:31:20 +0300
Subject: [PATCH] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=BB?=
 =?UTF-8?q?=D0=B5=D0=BD=D0=BE=20=D0=BF=D0=B5=D1=80=D0=B5=D0=BF=D0=BE=D0=BB?=
 =?UTF-8?q?=D0=BD=D0=B5=D0=BD=D0=B8=D0=B5=20=D0=BE=D0=B1=D1=8A=D1=91=D0=BC?=
 =?UTF-8?q?=D0=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 calc.py | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/calc.py b/calc.py
index fc9ecde..50fa105 100644
--- a/calc.py
+++ b/calc.py
@@ -12,7 +12,7 @@ def sround(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:
 		if num == i[0]:
@@ -34,9 +34,17 @@ def calc(el, amount, main = False):
 		parts += i[1]
 
 	# Делаем поправку на выход
-	if out < parts:
+	while out < parts:
+		# Предварительная часть
+		part = sround(amount/parts)
 		print(el, ': ',out,' < ', parts)
-		parts = out
+		# Если итоговый объём <= входного объёма
+		if (parts+1)*part <= amount:
+			parts += 1
+		else:
+			break
+
+#		parts = out
 
 	# Считаем 1 часть
 	part = sround(amount/parts)