@@ -109,6 +109,7 @@ def __init__(
109
109
# self.building_properties = building_properties
110
110
self .envelope_lookup = envelope_lookup
111
111
self .geometry = building_properties .geometry [self .name ]
112
+ self .typology = building_properties .typology [self .name ]
112
113
self .envelope = building_properties .envelope [self .name ]
113
114
self .surface_area = self .get_component_quantity (building_properties )
114
115
self .timeline = self .initialize_timeline (end_year )
@@ -152,7 +153,7 @@ def log_emissions(area, ghg, biogenic, demolition, lifetime, key):
152
153
)
153
154
self .log_emission_in_timeline (
154
155
emission = 0.0 , # when building is first built, no demolition emission
155
- year = self .geometry ["year" ],
156
+ year = self .typology ["year" ],
156
157
col = f"demolition_{ key } _kgCO2" ,
157
158
additive = False ,
158
159
)
@@ -203,7 +204,7 @@ def demolish(self, demolition_year: int) -> None:
203
204
:type demolition_year: int
204
205
"""
205
206
# if demolition_year < self.geometry["year"], raise error
206
- if demolition_year < self .geometry ["year" ]:
207
+ if demolition_year < self .typology ["year" ]:
207
208
raise ValueError (
208
209
"Demolition year must be greater than or equal to the construction year."
209
210
)
@@ -230,7 +231,7 @@ def initialize_timeline(self, end_year: int) -> pd.DataFrame:
230
231
:return: The initialized timeline DataFrame.
231
232
:rtype: pd.DataFrame
232
233
"""
233
- start_year = self .geometry ["year" ]
234
+ start_year = self .typology ["year" ]
234
235
if start_year >= end_year :
235
236
raise ValueError ("The starting year must be less than the ending year." )
236
237
@@ -265,7 +266,7 @@ def log_emission_with_lifetime(
265
266
raise ValueError ("Lifetime must be at least 1 year." )
266
267
267
268
years = list (
268
- range (self .geometry ["year" ], self .timeline .index .max () + 1 , lifetime )
269
+ range (self .typology ["year" ], self .timeline .index .max () + 1 , lifetime )
269
270
)
270
271
self .log_emission_in_timeline (emission , years , col )
271
272
0 commit comments