s_ranjbar/system_assignation
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

changed units to new item in dictionaries in to_dictionary methods

Browse Source
This commit is contained in:
Pilar Monsalvete 2023-07-13 17:06:42 -04:00
parent 24620d485e
commit 2af993630a
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
hub/catalog_factories/data_models/cost/fuel.py
View File

@ -61,7 +61,8 @@ class Fuel:
content = {'Fuel': {'fuel type': self.type, content = {'Fuel': {'fuel type': self.type,
'fixed operational costs [currency/month]': self.fixed_monthly, 'fixed operational costs [currency/month]': self.fixed_monthly,
'fixed operational costs depending on the peak power consumed [currency/month W]': self.fixed_power, 'fixed operational costs depending on the peak power consumed [currency/month W]': self.fixed_power,
f'variable costs [{self.variable[1]}]': self.variable[0] 'variable operational costs': self.variable[0],
'units': self.variable[1]
} }
} }

9
hub/catalog_factories/data_models/cost/item_description.py
View File

@ -73,9 +73,12 @@ class ItemDescription:
def to_dictionary(self): def to_dictionary(self):
"""Class content to dictionary""" """Class content to dictionary"""
content = {'Item': {'type': self.type, content = {'Item': {'type': self.type,
f'initial investment [{self.initial_investment[1]}]': self.initial_investment[0], 'initial investment': self.initial_investment[0],
f'refurbishment [{self.refurbishment[1]}]': self.refurbishment[0], 'initial investment units': self.initial_investment[1],
f'reposition [{self.reposition[1]}]': self.reposition[0], 'refurbishment': self.refurbishment[0],
'refurbishment units': self.refurbishment[1],
'reposition': self.reposition[0],
'reposition units': self.reposition[1],
'life time [years]': self.lifetime 'life time [years]': self.lifetime
} }
} }