Spaces:
Sleeping
Sleeping
Update app.py
Browse files
app.py
CHANGED
@@ -731,12 +731,11 @@ class NutrientCalculator:
|
|
731 |
'Ca': self.profile["Ca"], # Общий кальций
|
732 |
'CaCl': self.profile.get("CaCl", 0), # Кальций из CaCl2
|
733 |
'S': self.profile["S"],
|
734 |
-
'Cl': 0, # Хлор пока не учитываем
|
735 |
'N (NO3-)': self.profile["TOTAL_NITROG"] * (self.profile["NO3_RAT"] / total_parts),
|
736 |
'N (NH4+)': self.profile["TOTAL_NITROG"] * (1 / total_parts)
|
737 |
}
|
738 |
|
739 |
-
self.actual = {k: 0.0 for k in self.target}
|
740 |
# Инициализация всех удобрений с нулевым весом
|
741 |
self.results = {fert: {'граммы': 0.0} for fert in self.fertilizers}
|
742 |
|
@@ -771,7 +770,8 @@ class NutrientCalculator:
|
|
771 |
|
772 |
for el, val in self.fertilizers[name].items():
|
773 |
added_ppm = (grams * val * 1000) / self.volume
|
774 |
-
self.actual
|
|
|
775 |
|
776 |
def _balance_k_s(self):
|
777 |
k_needed = self.target["K"] - self.actual["K"]
|
@@ -802,6 +802,8 @@ class NutrientCalculator:
|
|
802 |
def _verify_results(self):
|
803 |
deficits = {}
|
804 |
for el in self.target:
|
|
|
|
|
805 |
diff = self.target[el] - self.actual[el]
|
806 |
if abs(diff) > 0.1:
|
807 |
deficits[el] = round(diff, 3)
|
@@ -821,6 +823,8 @@ class NutrientCalculator:
|
|
821 |
|
822 |
element_table = []
|
823 |
for el in sorted(self.target.keys()):
|
|
|
|
|
824 |
element_table.append([
|
825 |
el,
|
826 |
f"{self.target[el]} ppm",
|
|
|
731 |
'Ca': self.profile["Ca"], # Общий кальций
|
732 |
'CaCl': self.profile.get("CaCl", 0), # Кальций из CaCl2
|
733 |
'S': self.profile["S"],
|
|
|
734 |
'N (NO3-)': self.profile["TOTAL_NITROG"] * (self.profile["NO3_RAT"] / total_parts),
|
735 |
'N (NH4+)': self.profile["TOTAL_NITROG"] * (1 / total_parts)
|
736 |
}
|
737 |
|
738 |
+
self.actual = {k: 0.0 for k in self.target if k != "CaCl"} # CaCl не учитываем в фактическом балансе
|
739 |
# Инициализация всех удобрений с нулевым весом
|
740 |
self.results = {fert: {'граммы': 0.0} for fert in self.fertilizers}
|
741 |
|
|
|
770 |
|
771 |
for el, val in self.fertilizers[name].items():
|
772 |
added_ppm = (grams * val * 1000) / self.volume
|
773 |
+
if el in self.actual:
|
774 |
+
self.actual[el] += added_ppm
|
775 |
|
776 |
def _balance_k_s(self):
|
777 |
k_needed = self.target["K"] - self.actual["K"]
|
|
|
802 |
def _verify_results(self):
|
803 |
deficits = {}
|
804 |
for el in self.target:
|
805 |
+
if el == "CaCl": # Пропускаем проверку CaCl
|
806 |
+
continue
|
807 |
diff = self.target[el] - self.actual[el]
|
808 |
if abs(diff) > 0.1:
|
809 |
deficits[el] = round(diff, 3)
|
|
|
823 |
|
824 |
element_table = []
|
825 |
for el in sorted(self.target.keys()):
|
826 |
+
if el == "CaCl": # Пропускаем CaCl в отчете
|
827 |
+
continue
|
828 |
element_table.append([
|
829 |
el,
|
830 |
f"{self.target[el]} ppm",
|