From 51023cd89792f71b1cc1b2dae93c818102609501 Mon Sep 17 00:00:00 2001
From: none <none>
Date: Sat, 27 Jan 2024 23:20:01 +0300
Subject: [PATCH] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5?=
 =?UTF-8?q?=D0=BD=D1=8B=20=D0=B5=D1=89=D1=91=20=D0=BE=D0=BA=D1=80=D1=83?=
 =?UTF-8?q?=D0=B3=D0=BB=D0=B5=D0=BD=D0=B8=D1=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 calc.py | 23 ++++++++++-------------
 1 file changed, 10 insertions(+), 13 deletions(-)

diff --git a/calc.py b/calc.py
index 35348cd..fc9ecde 100644
--- a/calc.py
+++ b/calc.py
@@ -12,16 +12,11 @@ def sround(num):
 	num = floor(num)
 
 	# Подмены
-	rep = [[16,15], [33,30]]
+	rep = [[16,15], [33,30], [21,20], [12,10], [8,5]]
 
 	for i in rep:
 		if num == i[0]:
 			num = i[1]
-	# Делаем около-кратным 10 и 15
-#	if abs(num - round(num/10)*10) <= 1:
-#		num = round(num/10)*10
-#	if abs(num - round(num/15)*15) <= 1:
-#		num = round(num/15)*15
 
 	return num
 
@@ -31,11 +26,18 @@ def calc(el, amount, main = False):
 		recipe = {}
 
 	comps = db[el][1:] # Получаем составные
+	out = db[el][0] #Количество на выходе
 
 	# Считаем количество частей
 	parts = 0
 	for i in comps:
 		parts += i[1]
+
+	# Делаем поправку на выход
+	if out < parts:
+		print(el, ': ',out,' < ', parts)
+		parts = out
+
 	# Считаем 1 часть
 	part = sround(amount/parts)
 
@@ -63,15 +65,10 @@ def calc(el, amount, main = False):
 					recipe[i[0]] += part*i[1]
 
 	if main:
+		print('PART: ', part)
 		return [recipe, parts*part]
 	else:
+		print('PART: ', part)
 		return part*parts
 
-#calc("Бикаридин", 100)
-#calc("Эпинефрин", 100)
 #print( calc("Лексорин", 100, True))
-#calc("Амбузол", 100)
-#calc("Амбузол плюс", 100)
-#print( calc("Аммиак", 100, True) )
-
-#print(recipe)