renamed functions, optimized gen fuel calcs

Author: b0ndman

src/migrids_lite/Powerhouse.py

@@ -48,34 +48,34 @@ def __init__(self, gensets: tuple):
         # self.combo_mol_caps = dict(sorted(self.combo_mol_caps.keys()))
         # self.gencombos = tuple(self.combo_mol_caps.keys())
 
-    def calc_gencombo(self, eload: float, select_combo: tuple):
+    def calc_gen_fuel(self, gen_loads: dict):
         """
         calculate the fuel usage of the generator combo
         :param eload: the overall electrical load
         :param select_combo: the combination of generators to be used
         :return: the dict of the fuel usage, keys are generators and values are pandas dataframes
         """
-        if select_combo is None:
-            return {'None': 0}
-
-        sum = 0
-        if len(select_combo) == 1:
-            sum = self.gendict_cap[select_combo[0]]
-        else:
-            for generator in select_combo:
-                sum += self.gendict_cap[generator]
-
-        if sum != 0:
-            ratios = {item:self.gendict_cap[item]/sum for item in select_combo}
-        else:
-            # if the generators are off there is nothing to return
-            return 0
-
-        pwrhouse_usage = {gen: round(self.gensets[gen].calc_diesel_usage(eload*ratios[gen]), 3)
-                          for gen in select_combo}
+        # if select_combo is None:
+        #     return {'None': 0}
+        #
+        # sum = 0
+        # if len(select_combo) == 1:
+        #     sum = self.gendict_cap[select_combo[0]]
+        # else:
+        #     for generator in select_combo:
+        #         sum += self.gendict_cap[generator]
+        #
+        # if sum != 0:
+        #     ratios = {item:self.gendict_cap[item]/sum for item in select_combo}
+        # else:
+        #     # if the generators are off there is nothing to return
+        #     return 0
+
+        pwrhouse_usage = {gen: round(self.gensets[gen].calc_diesel_usage(gen_loads[gen]), 3)
+                          for gen in gen_loads}
         return pwrhouse_usage
 
-    def calc_genload(self, eload: float, select_combo: tuple):
+    def calc_gen_load(self, eload: float, select_combo: tuple):
         """
         calculate the per generator load
         :param eload: the overall load

src/migrids_lite/System.py

@@ -98,4 +98,4 @@ def __init__(self, load_input: e_type.EnergyType, power_house: powhaus.Powerhous
 
             self.fuel_usages = tanks.TankFarm(power_house, self.shift.vitals)
 
-        else: raise Exception('unrecognized mode')
+        else: raise Exception('unrecognized mode')

src/migrids_lite/TankFarm.py

@@ -12,8 +12,8 @@ def __init__(self, power_house: powhaus, vitals: pd.DataFrame):
         # needs to be from index 1 since initialization from 0 happens at the zero index
         inter['gen_combo'] = self.vitals['diesel_out'][1:].apply(self.kraftwerk.find_cap_combo)
         inter['diesel_out'] = self.vitals['diesel_out'][1:]
-        self.usages['gen_power'] = inter.apply(lambda x: self.kraftwerk.calc_genload(x['diesel_out'], x['gen_combo']), axis=1)
-        self.usages['gen_fuel_used'] = inter.apply(lambda x: self.kraftwerk.calc_gencombo(x['diesel_out'], x['gen_combo']), axis=1)
+        self.usages['gen_power'] = inter.apply(lambda x: self.kraftwerk.calc_gen_load(x['diesel_out'], x['gen_combo']), axis=1)
+        self.usages['gen_fuel_used'] = self.usages.apply(lambda x: self.kraftwerk.calc_gen_fuel(x['gen_power']), axis=1)
         self.usages['timestep_fuel_used'] = self.usages.apply(lambda x: sum(x['gen_fuel_used'].values()), axis=1)
 
         self.vitals = pd.concat([self.vitals, self.usages], axis=1)