Compare commits

..

No commits in common. "5d9aaa63ada249e79d88e18f0ab8d1aa3c82a477" and "0c17fa48b547da96600bff6296575049cc7bab16" have entirely different histories.

View File

@ -12,38 +12,21 @@ Mohammad Reza Seyedabadi mohammad.seyedabadi@mail.concordia.ca
class EndOfLifeEmission: class EndOfLifeEmission:
def __init__( def __init__(self):
self, recycling_ratio, onsite_recycling_ratio, pass
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 = \
companies_recycling_machine_emission
self.landfilling_machine_emission = landfilling_machine_emission
def demolition(self, demolition_work_load): def demolition(self, demolition_machine_emission, demolition_work_load):
return self.demolition_machine_emission * demolition_work_load pass
def onsite_recycling(self, onsite_work_load): def onsite_recycling(self, onsite_machine_emission, onsite_work_load):
return self.onsite_recycling_ratio * \ pass
self.onsite_machine_emission * \
onsite_work_load
def companies_recycling(self, companies_recycling_work_load): def companies_recycling(self, companies_recycling_machine_emission,
return self.company_recycling_ratio * \ companies_recycling_work_load):
self.companies_recycling_machine_emission * \ pass
companies_recycling_work_load
def landfilling(self, landfilling_work_load): def landfilling(self, landfilling_machine_emission, landfilling_work_load):
return self.landfilling_ratio * \ pass
self.landfilling_machine_emission * \
landfilling_work_load
def calculate_end_of_life_emission(self): def calculate_end_of_life_emission(self):
pass pass