Skip to content

Commit b92ce5c

Browse files
committed
chore: don't return emission results
Don't expose emission results when evaluating emissions
1 parent f38eefd commit b92ce5c

File tree

2 files changed

+32
-9
lines changed

2 files changed

+32
-9
lines changed

src/libecalc/presentation/yaml/model.py

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -372,7 +372,7 @@ def evaluate_energy_usage(self):
372372

373373
self._consumer_results[energy_component.id] = consumer_result
374374

375-
def evaluate_emissions(self) -> dict[str, dict[str, TimeSeriesStreamDayRate]]:
375+
def evaluate_emissions(self):
376376
"""
377377
Calculate emissions for fuel consumers and emitters
378378
@@ -388,8 +388,6 @@ def evaluate_emissions(self) -> dict[str, dict[str, TimeSeriesStreamDayRate]]:
388388
if emission_result is not None:
389389
self._emission_results[energy_component.id] = emission_result
390390

391-
return self._emission_results
392-
393391
def get_graph_result(self) -> GraphResult:
394392
return GraphResult(
395393
graph=self._get_graph(),

tests/libecalc/presentation/yaml/test_venting_emitter.py

Lines changed: 31 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -338,10 +338,26 @@ def test_venting_emitter_condition_mapping_and_evaluation(
338338
resources = {
339339
prod_data_timeseries.name: prod_data_resource,
340340
}
341-
yaml_direct_emitter = YamlVentingEmitterDirectTypeBuilder().with_test_data().validate()
342-
yaml_direct_emitter.emissions[0].rate.value = "SIM1;EMISSION_RATE"
343-
344-
yaml_direct_emitter.emissions[0].rate.condition = "SIM1;CONDITION_VAR > 3"
341+
yaml_direct_emitter = (
342+
YamlVentingEmitterDirectTypeBuilder()
343+
.with_test_data()
344+
.with_emissions(
345+
[
346+
YamlVentingEmissionBuilder()
347+
.with_test_data()
348+
.with_name("CO2")
349+
.with_rate(
350+
YamlEmissionRateBuilder()
351+
.with_test_data()
352+
.with_value("SIM1;EMISSION_RATE")
353+
.with_condition("SIM1;CONDITION_VAR > 3")
354+
.validate()
355+
)
356+
.validate()
357+
]
358+
)
359+
.validate()
360+
)
345361
asset = (
346362
yaml_asset_builder_factory()
347363
.with_start("2020-01-01")
@@ -365,7 +381,16 @@ def test_venting_emitter_condition_mapping_and_evaluation(
365381
output_frequency=Frequency.NONE,
366382
)
367383
model.validate_for_run()
368-
result = model.evaluate_emissions()
384+
model.evaluate_emissions()
385+
386+
installations = model.get_installations()
387+
assert len(installations) == 1
388+
emitters = installations[0].get_emitters()
389+
assert len(emitters) == 1
390+
emitter = emitters[0]
369391

370392
# First period does not meet condition, second period meets condition
371-
assert result["VentingEmitterDirectTypeDefault"]["ventingemissiondefault"].values == [0.0, 0.002]
393+
emissions = emitter.get_emissions()
394+
assert len(emissions) == 1
395+
emission = emissions["co2"]
396+
assert emission.values == [0.0, 0.002]

0 commit comments

Comments
 (0)