m_osman/city_retrofit
1
0
Fork 0
forked from s_ranjbar/city_retrofit
Code Pull Requests Activity

changed percentage to per one (-)

Browse Source
This commit is contained in:
Pilar 2023-03-16 12:24:09 -04:00
parent 64384876a4
commit d672eee762
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
hub/catalog_factories/cost/montreal_custom_catalog.py
View File

@ -81,8 +81,8 @@ class MontrealCustomCatalog(Catalog):
items_list.append(item_description) items_list.append(item_description)
general_chapters.append(Chapter('D_services', items_list)) general_chapters.append(Chapter('D_services', items_list))
design_allowance = float(entry['Z_allowances_overhead_profit']['Z10_design_allowance']['#text']) design_allowance = float(entry['Z_allowances_overhead_profit']['Z10_design_allowance']['#text']) / 100
overhead_and_profit = float(entry['Z_allowances_overhead_profit']['Z10_overhead_and_profit']['#text']) overhead_and_profit = float(entry['Z_allowances_overhead_profit']['Z10_overhead_and_profit']['#text']) / 100
_capital_cost = CapitalCost(general_chapters, design_allowance, overhead_and_profit) _capital_cost = CapitalCost(general_chapters, design_allowance, overhead_and_profit)
return _capital_cost return _capital_cost
@ -135,7 +135,7 @@ class MontrealCustomCatalog(Catalog):
hvac = float(archetype['incomes']['subsidies']['hvac_subsidy']['#text']) hvac = float(archetype['incomes']['subsidies']['hvac_subsidy']['#text'])
photovoltaic_system = float(archetype['incomes']['subsidies']['photovoltaic_subsidy']['#text']) photovoltaic_system = float(archetype['incomes']['subsidies']['photovoltaic_subsidy']['#text'])
electricity_exports = float(archetype['incomes']['energy_exports']['electricity']['#text']) / 1000 / 3600 electricity_exports = float(archetype['incomes']['energy_exports']['electricity']['#text']) / 1000 / 3600
reduction_tax = float(archetype['incomes']['tax_reduction']['#text']) reduction_tax = float(archetype['incomes']['tax_reduction']['#text']) / 100
income = Income(construction_subsidy=construction, income = Income(construction_subsidy=construction,
hvac_subsidy=hvac, hvac_subsidy=hvac,
photovoltaic_subsidy=photovoltaic_system, photovoltaic_subsidy=photovoltaic_system,

4
hub/catalog_factories/data_models/cost/capital_cost.py
View File

@ -26,7 +26,7 @@ class CapitalCost:
@property @property
def design_allowance(self): def design_allowance(self):
""" """
Get design allowance in percentage Get design allowance in percentage (-)
:return: float :return: float
""" """
return self._design_allowance return self._design_allowance
@ -34,7 +34,7 @@ class CapitalCost:
@property @property
def overhead_and_profit(self): def overhead_and_profit(self):
""" """
Get overhead profit in percentage Get overhead profit in percentage (-)
:return: float :return: float
""" """
return self._overhead_and_profit return self._overhead_and_profit

2
hub/catalog_factories/data_models/cost/income.py
View File

@ -56,7 +56,7 @@ class Income:
@property @property
def reductions_taxes(self) -> Union[None, float]: def reductions_taxes(self) -> Union[None, float]:
""" """
Get reduction in taxes in percentage Get reduction in taxes in percentage (-)
:return: None or float :return: None or float
""" """
return self._reductions_taxes return self._reductions_taxes