Spaces:
Sleeping
Sleeping
Update app.py
Browse files
app.py
CHANGED
@@ -680,7 +680,7 @@ def view_image():
|
|
680 |
|
681 |
|
682 |
|
683 |
-
|
684 |
|
685 |
TOMATO_PROFILE = {
|
686 |
'N (NO3-)': 200,
|
@@ -692,15 +692,15 @@ TOMATO_PROFILE = {
|
|
692 |
'S': 100
|
693 |
}
|
694 |
|
695 |
-
#
|
696 |
EC_FACTORS = {
|
697 |
'N (NO3-)': 0.71,
|
698 |
-
'N (NH4+)': 0.
|
699 |
-
'P': 0.
|
700 |
-
'K': 0.
|
701 |
-
'Mg': 0.
|
702 |
-
'Ca': 0.
|
703 |
-
'S': 0.
|
704 |
}
|
705 |
|
706 |
fertilizers_db = {
|
@@ -803,21 +803,27 @@ class NutrientCalculator:
|
|
803 |
self.final_profile['N (NH4+)'] = 0
|
804 |
|
805 |
def calculate_ec(self):
|
806 |
-
"""Расчет электропроводимости (EC) в mS/cm"""
|
807 |
total_ec = 0.0
|
808 |
for element, concentration in TOMATO_PROFILE.items():
|
809 |
if element in EC_FACTORS:
|
810 |
total_ec += concentration * EC_FACTORS[element] / 1000
|
811 |
-
return round(total_ec,
|
|
|
|
|
|
|
|
|
812 |
|
813 |
def print_report(self):
|
814 |
ec_value = self.calculate_ec()
|
|
|
815 |
|
816 |
print("=" * 50)
|
817 |
print(f"РАСЧЕТ ДЛЯ {self.volume} ЛИТРОВ РАСТВОРА")
|
818 |
print("=" * 50)
|
819 |
|
820 |
-
print(f"\n
|
|
|
821 |
|
822 |
print("\nРЕКОМЕНДУЕМЫЕ УДОБРЕНИЯ:")
|
823 |
for fert, data in self.results.items():
|
|
|
680 |
|
681 |
|
682 |
|
683 |
+
|
684 |
|
685 |
TOMATO_PROFILE = {
|
686 |
'N (NO3-)': 200,
|
|
|
692 |
'S': 100
|
693 |
}
|
694 |
|
695 |
+
# Обновленные коэффициенты для перевода ppm в mS/cm (более точные)
|
696 |
EC_FACTORS = {
|
697 |
'N (NO3-)': 0.71,
|
698 |
+
'N (NH4+)': 0.72,
|
699 |
+
'P': 0.74,
|
700 |
+
'K': 0.70,
|
701 |
+
'Mg': 0.61,
|
702 |
+
'Ca': 0.66,
|
703 |
+
'S': 0.53
|
704 |
}
|
705 |
|
706 |
fertilizers_db = {
|
|
|
803 |
self.final_profile['N (NH4+)'] = 0
|
804 |
|
805 |
def calculate_ec(self):
|
806 |
+
"""Расчет электропроводимости (EC) в mS/cm с правильными коэффициентами"""
|
807 |
total_ec = 0.0
|
808 |
for element, concentration in TOMATO_PROFILE.items():
|
809 |
if element in EC_FACTORS:
|
810 |
total_ec += concentration * EC_FACTORS[element] / 1000
|
811 |
+
return round(total_ec, 3)
|
812 |
+
|
813 |
+
def calculate_total_ppm(self):
|
814 |
+
"""Расчет общего количества ppm в растворе"""
|
815 |
+
return sum(TOMATO_PROFILE.values())
|
816 |
|
817 |
def print_report(self):
|
818 |
ec_value = self.calculate_ec()
|
819 |
+
total_ppm = self.calculate_total_ppm()
|
820 |
|
821 |
print("=" * 50)
|
822 |
print(f"РАСЧЕТ ДЛЯ {self.volume} ЛИТРОВ РАСТВОРА")
|
823 |
print("=" * 50)
|
824 |
|
825 |
+
print(f"\nОБЩЕЕ КОЛИЧЕСТВО PPM: {total_ppm}")
|
826 |
+
print(f"РАСЧЕТНАЯ ЭЛЕКТРОПРОВОДИМОСТЬ (EC): {ec_value} mS/cm")
|
827 |
|
828 |
print("\nРЕКОМЕНДУЕМЫЕ УДОБРЕНИЯ:")
|
829 |
for fert, data in self.results.items():
|