From 80a07da9578e4ad5f4d33e9b55384e76ee332dd2 Mon Sep 17 00:00:00 2001 From: Tom Russell Date: Mon, 16 Oct 2017 11:19:03 +0100 Subject: [PATCH] Speed up get_enduse_tech --- energy_demand/enduse.py | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/energy_demand/enduse.py b/energy_demand/enduse.py index e6772ac4..694848c3 100644 --- a/energy_demand/enduse.py +++ b/energy_demand/enduse.py @@ -795,16 +795,15 @@ def get_enduse_tech(cls, fuel_tech_p_by): For every enduse technologes must either be defined for no fueltype or for all fueltypes """ - enduse_techs = set([]) - for _, tech_fueltype in fuel_tech_p_by.items(): + enduse_techs = [] + for tech_fueltype in fuel_tech_p_by.values(): for tech in tech_fueltype.keys(): - enduse_techs.add(tech) + enduse_techs.append(tech) if tech == 'dummy_tech': - enduse_techs = [] - return list(enduse_techs) + return [] - return list(enduse_techs) + return list(set(enduse_techs)) def service_switch(self, tot_service_h_cy, service_tech_by_p, tech_increase_service, tech_decrease_service, tech_constant_service, sig_param_tech, curr_yr): """Apply change in service depending on defined service switches