CERC/hub
58
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases 84 Wiki Activity

meb_debugging #8

Merged
g_gutierrez merged 15 commits from meb_debugging into main 2023-03-20 14:21:25 -04:00
Conversation 0 Commits 15 Files Changed 40 +6 -6
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit d672eee762 - Show all commits

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

@ -81,8 +81,8 @@ class MontrealCustomCatalog(Catalog):
items_list.append(item_description)
general_chapters.append(Chapter('D_services', items_list))
design_allowance = float(entry['Z_allowances_overhead_profit']['Z10_design_allowance']['#text'])
overhead_and_profit = float(entry['Z_allowances_overhead_profit']['Z10_overhead_and_profit']['#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']) / 100
_capital_cost = CapitalCost(general_chapters, design_allowance, overhead_and_profit)
return _capital_cost
@ -135,7 +135,7 @@ class MontrealCustomCatalog(Catalog):
hvac = float(archetype['incomes']['subsidies']['hvac_subsidy']['#text'])
photovoltaic_system = float(archetype['incomes']['subsidies']['photovoltaic_subsidy']['#text'])
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,
hvac_subsidy=hvac,
photovoltaic_subsidy=photovoltaic_system,

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

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

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

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