Skip to content
Snippets Groups Projects
Commit e80be319 authored by lukas leufen's avatar lukas leufen
Browse files

more docs and bugfix in tests

parent ab80fd42
No related branches found
No related tags found
2 merge requests!9new version v0.2.0,!8data generator
......@@ -103,7 +103,7 @@ class DataGenerator(keras.utils.Sequence):
"""
Select data for given key, create a DataPrep object and interpolate, transform, make history and labels and
remove nans.
:param key:
:param key: station key to choose the data generator.
:return: preprocessed data as a DataPrep instance
"""
station = self.get_station_key(key)
......@@ -115,11 +115,11 @@ class DataGenerator(keras.utils.Sequence):
data.history_label_nan_remove(self.interpolate_dim)
return data
def get_station_key(self, key: Union[str, int, List[Union[str, int]]]) -> str:
def get_station_key(self, key: Union[None, str, int, List[Union[None, str, int]]]) -> str:
"""
Return a valid station key or raise KeyError if this wasn't possible
:param key:
:return:
:param key: station key to choose the data generator.
:return: station key (id from database)
"""
# extract value if given as list
if isinstance(key, list):
......
......@@ -74,9 +74,9 @@ class TestDataGenerator:
def test_get_key_representation(self, gen):
gen.stations.append("DEBW108")
f = gen.__iter__.get_station_key
f = gen.get_station_key
iter(gen)
assert f(None) == "DEBW107"
assert f([None]) == "DEBW107"
with pytest.raises(KeyError) as e:
f([None, None])
assert "More than one key was given: [None, None]" in e.value.args[0]
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment