Spaces:
Running
Running
Update app.py
Browse files
app.py
CHANGED
@@ -705,9 +705,9 @@ INPUT_DATA = {
|
|
705 |
"profileSettings": {
|
706 |
"P": 31, "K": 210, "Mg": 50, "Ca": 82, "S": 63, "CaCl": 18.5,
|
707 |
"NO3_RAT": 8.4, "TOTAL_NITROG": 125, "liters": 100,
|
708 |
-
"activation_cacl": 5, #
|
709 |
-
"enhancement_cacl": 0.1, #
|
710 |
-
"
|
711 |
"magnesium_nitrate_ratio": 0 # Коэффициент для "Магния азотнокислого"
|
712 |
}
|
713 |
}
|
@@ -874,6 +874,7 @@ class NutrientCalculator:
|
|
874 |
report += f"\n- {el}: не хватает {abs(diff)} ppm"
|
875 |
return report
|
876 |
|
|
|
877 |
# Извлекаем данные из INPUT_DATA
|
878 |
fertilizer_constants = INPUT_DATA["fertilizerConstants"]
|
879 |
profile_settings = INPUT_DATA["profileSettings"]
|
@@ -881,8 +882,8 @@ liters = profile_settings["liters"]
|
|
881 |
rounding_precision = 3
|
882 |
activation_cacl = float(profile_settings.get("activation_cacl", 5))
|
883 |
enhancement_cacl = float(profile_settings.get("enhancement_cacl", 0.1))
|
884 |
-
|
885 |
-
magnesium_nitrate_ratio = float(profile_settings.get("magnesium_nitrate_ratio", 0.
|
886 |
|
887 |
# Создаем калькулятор
|
888 |
calculator = NutrientCalculator(
|
@@ -892,7 +893,7 @@ calculator = NutrientCalculator(
|
|
892 |
rounding_precision=rounding_precision,
|
893 |
activation_cacl=activation_cacl,
|
894 |
enhancement_cacl=enhancement_cacl,
|
895 |
-
|
896 |
magnesium_nitrate_ratio=magnesium_nitrate_ratio
|
897 |
)
|
898 |
|
|
|
705 |
"profileSettings": {
|
706 |
"P": 31, "K": 210, "Mg": 50, "Ca": 82, "S": 63, "CaCl": 18.5,
|
707 |
"NO3_RAT": 8.4, "TOTAL_NITROG": 125, "liters": 100,
|
708 |
+
"activation_cacl": 5, # Активация CaCl
|
709 |
+
"enhancement_cacl": 0.1, # Усиление CaCl
|
710 |
+
"use_magnesium_nitrate": 0, # Флаг для использования "Магния азотнокислого"
|
711 |
"magnesium_nitrate_ratio": 0 # Коэффициент для "Магния азотнокислого"
|
712 |
}
|
713 |
}
|
|
|
874 |
report += f"\n- {el}: не хватает {abs(diff)} ppm"
|
875 |
return report
|
876 |
|
877 |
+
|
878 |
# Извлекаем данные из INPUT_DATA
|
879 |
fertilizer_constants = INPUT_DATA["fertilizerConstants"]
|
880 |
profile_settings = INPUT_DATA["profileSettings"]
|
|
|
882 |
rounding_precision = 3
|
883 |
activation_cacl = float(profile_settings.get("activation_cacl", 5))
|
884 |
enhancement_cacl = float(profile_settings.get("enhancement_cacl", 0.1))
|
885 |
+
use_magnesium_nitrate = int(profile_settings.get("use_magnesium_nitrate", 1)) # Флаг для "Магния азотнокислого"
|
886 |
+
magnesium_nitrate_ratio = float(profile_settings.get("magnesium_nitrate_ratio", 0.3)) # Коэффициент для "Магния азотнокислого"
|
887 |
|
888 |
# Создаем калькулятор
|
889 |
calculator = NutrientCalculator(
|
|
|
893 |
rounding_precision=rounding_precision,
|
894 |
activation_cacl=activation_cacl,
|
895 |
enhancement_cacl=enhancement_cacl,
|
896 |
+
use_magnesium_nitrate=use_magnesium_nitrate, # Новое название флага
|
897 |
magnesium_nitrate_ratio=magnesium_nitrate_ratio
|
898 |
)
|
899 |
|