From c92c08ee61a3b609e7b11237089607d69c317612 Mon Sep 17 00:00:00 2001 From: Ben RdO Date: Wed, 2 Nov 2022 15:27:21 -0700 Subject: [PATCH] refactor: generalize generator type in the MockProfileInput class --- powersimdata/tests/mock_profile_input.py | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/powersimdata/tests/mock_profile_input.py b/powersimdata/tests/mock_profile_input.py index 096d83d4d..a9b5711dd 100644 --- a/powersimdata/tests/mock_profile_input.py +++ b/powersimdata/tests/mock_profile_input.py @@ -22,12 +22,6 @@ class MockProfileInput: :return: (*powersimdata.tests.mock_profile_input.MockProfileInput*) """ - _RESOURCES = { - "wind": {"wind", "wind_offshore"}, - "solar": {"solar"}, - "hydro": {"hydro"}, - } - def __init__( self, grid: Grid, @@ -38,6 +32,7 @@ def __init__( random_seed=6669, ): self._grid = grid + self._resources = grid.model_immutables.plants["group_profile_resources"] self._start_time = start_time self._end_time = end_time self._periods = periods @@ -48,7 +43,7 @@ def __init__( "demand": self._get_demand(), **{ resource: self._get_resource_profile(resource) - for resource in self._RESOURCES.keys() + for resource in sorted(self._resources.keys(), reverse=True) }, } self._profiles.update(self._get_demand_flexibility()) @@ -109,7 +104,7 @@ def _get_plant_ids_for_type(self, resource_type): :param str resource_type: Can be any of *'hydro'*, *'solar'*, or *'wind'*. :return: (*list*) -- list of plant_ids """ - resources = self._RESOURCES[resource_type] + resources = self._resources[resource_type] plant_ids = list(self._grid.plant[lambda ds: ds.type.isin(resources)].index) return plant_ids