From 5d9aaa63ada249e79d88e18f0ab8d1aa3c82a477 Mon Sep 17 00:00:00 2001 From: Alireza Adli Date: Thu, 1 Aug 2024 09:36:58 -0400 Subject: [PATCH] Add ratios --- .../lca_end_of_life_carbon.py | 20 +++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/hub/city_model_structure/life_cycle_assessment/lca_end_of_life_carbon.py b/hub/city_model_structure/life_cycle_assessment/lca_end_of_life_carbon.py index f7865a9a..04346a74 100644 --- a/hub/city_model_structure/life_cycle_assessment/lca_end_of_life_carbon.py +++ b/hub/city_model_structure/life_cycle_assessment/lca_end_of_life_carbon.py @@ -13,8 +13,14 @@ Mohammad Reza Seyedabadi mohammad.seyedabadi@mail.concordia.ca class EndOfLifeEmission: def __init__( - self, demolition_machine_emission, onsite_machine_emission, + self, recycling_ratio, onsite_recycling_ratio, + company_recycling_ratio, landfilling_ratio, + demolition_machine_emission, onsite_machine_emission, companies_recycling_machine_emission, landfilling_machine_emission): + self.recycling_ratio = recycling_ratio + self.onsite_recycling_ratio = onsite_recycling_ratio + self.company_recycling_ratio = company_recycling_ratio + self.landfilling_ratio = landfilling_ratio self.demolition_machine_emission = demolition_machine_emission self.onsite_machine_emission = onsite_machine_emission self.companies_recycling_machine_emission = \ @@ -25,13 +31,19 @@ class EndOfLifeEmission: return self.demolition_machine_emission * demolition_work_load def onsite_recycling(self, onsite_work_load): - return self.onsite_machine_emission * onsite_work_load + return self.onsite_recycling_ratio * \ + self.onsite_machine_emission * \ + onsite_work_load def companies_recycling(self, companies_recycling_work_load): - return self.companies_recycling_machine_emission * companies_recycling_work_load + return self.company_recycling_ratio * \ + self.companies_recycling_machine_emission * \ + companies_recycling_work_load def landfilling(self, landfilling_work_load): - return self.landfilling_machine_emission * landfilling_work_load + return self.landfilling_ratio * \ + self.landfilling_machine_emission * \ + landfilling_work_load def calculate_end_of_life_emission(self): pass