DmitrMakeev commited on
Commit
2d7ec96
·
verified ·
1 Parent(s): 8df06cc

Update app.py

Browse files
Files changed (1) hide show
  1. app.py +4 -11
app.py CHANGED
@@ -725,20 +725,11 @@ class HydroCalculator:
725
  ppm = {}
726
  for name, grams in self.fertilizers:
727
  for element, ratio in fertilizers_db[name].items():
728
- ppm[element] = ppm.get(element, 0) + (grams * ratio * 1000) / (self.volume * 10)
729
  return ppm
730
 
731
- def calculate_ppm_ec(self):
732
- ppm_ec = {}
733
- for name, grams in self.fertilizers:
734
- for element, ratio in fertilizers_db[name].items():
735
- ppm_ec[element] = ppm_ec.get(element, 0) + (grams * ratio * 1000)
736
- return ppm
737
-
738
-
739
-
740
  def calculate_ec(self):
741
- ppm_ec = self.calculate_ppm_ec()
742
  ec = 0.0
743
  EC_COEFFICIENTS = {
744
  'N (NO3-)': 0.6,
@@ -865,6 +856,8 @@ print(f"NH4+: {ppm.get('N (NH4+)', 0):.2f} ppm")
865
 
866
 
867
 
 
 
868
 
869
 
870
 
 
725
  ppm = {}
726
  for name, grams in self.fertilizers:
727
  for element, ratio in fertilizers_db[name].items():
728
+ ppm[element] = ppm.get(element, 0) + (grams * ratio * 1000) / self.volume
729
  return ppm
730
 
 
 
 
 
 
 
 
 
 
731
  def calculate_ec(self):
732
+ ppm = self.calculate_ppm()
733
  ec = 0.0
734
  EC_COEFFICIENTS = {
735
  'N (NO3-)': 0.6,
 
856
 
857
 
858
 
859
+
860
+
861
 
862
 
863