Skip to content

Commit a9af474

Browse files
authored
Merge pull request #31 from CESNET/feat-decoupling-docs-from-code
Feat decoupling docs from code
2 parents da853ed + 778b666 commit a9af474

37 files changed

+1008
-939
lines changed

cesnet_tszoo/benchmarks.py

Lines changed: 24 additions & 24 deletions
Large diffs are not rendered by default.

cesnet_tszoo/configs/base_config.py

Lines changed: 82 additions & 67 deletions
Large diffs are not rendered by default.

cesnet_tszoo/configs/disjoint_time_based_config.py

Lines changed: 65 additions & 46 deletions
Large diffs are not rendered by default.

cesnet_tszoo/configs/handlers/series_based_handler.py

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
from abc import ABC
22
from logging import Logger
3+
from typing import Optional
34

45
import numpy as np
56
import numpy.typing as npt
@@ -16,19 +17,19 @@ def __init__(self,
1617
val_ts: list[int] | npt.NDArray[np.int_] | float | int | None,
1718
test_ts: list[int] | npt.NDArray[np.int_] | float | int | None):
1819

19-
self.train_ts = train_ts
20-
self.val_ts = val_ts
21-
self.test_ts = test_ts
22-
self.all_ts = None
20+
self.train_ts: Optional[np.ndarray] = train_ts
21+
self.val_ts: Optional[np.ndarray] = val_ts
22+
self.test_ts: Optional[np.ndarray] = test_ts
23+
self.all_ts: Optional[np.ndarray] = None
2324

24-
self.uses_all_ts = uses_all_ts
25+
self.uses_all_ts: bool = uses_all_ts
2526

26-
self.train_ts_row_ranges = None
27-
self.val_ts_row_ranges = None
28-
self.test_ts_row_ranges = None
29-
self.all_ts_row_ranges = None
27+
self.train_ts_row_ranges: Optional[np.ndarray] = None
28+
self.val_ts_row_ranges: Optional[np.ndarray] = None
29+
self.test_ts_row_ranges: Optional[np.ndarray] = None
30+
self.all_ts_row_ranges: Optional[np.ndarray] = None
3031

31-
self.logger = logger
32+
self.logger: Logger = logger
3233

3334
def _prepare_and_set_ts_sets(self, all_ts_ids: np.ndarray, all_ts_row_ranges: np.ndarray, ts_id_name: str, random_state) -> None:
3435
"""Validates and filters the input time series IDs based on the `dataset` and `source_type`. Handles random split."""

cesnet_tszoo/configs/handlers/time_based_handler.py

Lines changed: 19 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
from abc import ABC
22
from datetime import datetime, timezone
33
from logging import Logger
4+
from typing import Optional
45

56
import numpy as np
67

@@ -24,31 +25,31 @@ def __init__(self,
2425
val_time_period: tuple[datetime, datetime] | range | float | None,
2526
test_time_period: tuple[datetime, datetime] | range | float | None):
2627

27-
self.train_time_period = train_time_period
28-
self.val_time_period = val_time_period
29-
self.test_time_period = test_time_period
28+
self.train_time_period: Optional[np.ndarray] = train_time_period
29+
self.val_time_period: Optional[np.ndarray] = val_time_period
30+
self.test_time_period: Optional[np.ndarray] = test_time_period
3031

31-
self.train_batch_size = train_batch_size
32-
self.val_batch_size = val_batch_size
33-
self.test_batch_size = test_batch_size
34-
self.all_batch_size = all_batch_size
32+
self.train_batch_size: int = train_batch_size
33+
self.val_batch_size: int = val_batch_size
34+
self.test_batch_size: int = test_batch_size
35+
self.all_batch_size: int = all_batch_size
3536

36-
self.set_shared_size = set_shared_size
37+
self.set_shared_size: int | float = set_shared_size
3738

38-
self.sliding_window_size = sliding_window_size
39-
self.sliding_window_prediction_size = sliding_window_prediction_size
40-
self.sliding_window_step = sliding_window_step
39+
self.sliding_window_size: Optional[int] = sliding_window_size
40+
self.sliding_window_prediction_size: Optional[int] = sliding_window_prediction_size
41+
self.sliding_window_step: int = sliding_window_step
4142

42-
self.uses_all_time_period = uses_all_time_period
43+
self.uses_all_time_period: bool = uses_all_time_period
4344

44-
self.display_train_time_period = None
45-
self.display_val_time_period = None
46-
self.display_test_time_period = None
47-
self.display_all_time_period = None
45+
self.display_train_time_period: Optional[range] = None
46+
self.display_val_time_period: Optional[range] = None
47+
self.display_test_time_period: Optional[range] = None
48+
self.display_all_time_period: Optional[range] = None
4849

49-
self.all_time_period = None
50+
self.all_time_period: Optional[np.ndarray] = None
5051

51-
self.logger = logger
52+
self.logger: Logger = logger
5253

5354
def _prepare_and_set_time_period_sets(self, all_time_ids: np.ndarray, time_format: TimeFormat) -> None:
5455
"""Validates and filters `train_time_period`, `val_time_period`, `test_time_period` and `all_time_period` based on `dataset` and `aggregation`. """

cesnet_tszoo/configs/series_based_config.py

Lines changed: 66 additions & 50 deletions
Large diffs are not rendered by default.

cesnet_tszoo/configs/time_based_config.py

Lines changed: 77 additions & 57 deletions
Large diffs are not rendered by default.

cesnet_tszoo/datasets/cesnet_dataset.py

Lines changed: 109 additions & 152 deletions
Large diffs are not rendered by default.

cesnet_tszoo/datasets/databases/cesnet_database.py

Lines changed: 26 additions & 26 deletions
Large diffs are not rendered by default.

cesnet_tszoo/datasets/databases/cesnet_timeseries24/cesnet_timeseries24.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,12 +50,12 @@ def get_dataset(cls, data_root: str, source_type: SourceType | Literal["ip_addre
5050
data_root: Path to the folder where the dataset will be stored. Each database has its own subfolder `data_root/tszoo/databases/database_name/`.
5151
source_type: The source type of the desired dataset.
5252
aggregation: The aggregation type for the selected source type.
53-
dataset_type: Type of a dataset you want to create. Can be [`TimeBasedCesnetDataset`][cesnet_tszoo.datasets.time_based_cesnet_dataset.TimeBasedCesnetDataset], [`SeriesBasedCesnetDataset`][cesnet_tszoo.datasets.series_based_cesnet_dataset.SeriesBasedCesnetDataset] or [`DisjointTimeBasedCesnetDataset`][cesnet_tszoo.datasets.disjoint_time_based_cesnet_dataset.DisjointTimeBasedCesnetDataset].
53+
dataset_type: Type of a dataset you want to create. Can be [`TimeBasedCesnetDataset`](reference_time_based_cesnet_dataset.md#cesnet_tszoo.datasets.time_based_cesnet_dataset.TimeBasedCesnetDataset), [`SeriesBasedCesnetDataset`](reference_series_based_cesnet_dataset.md#cesnet_tszoo.datasets.series_based_cesnet_dataset.SeriesBasedCesnetDataset) or [`DisjointTimeBasedCesnetDataset`](reference_disjoint_time_based_cesnet_dataset.md#cesnet_tszoo.datasets.disjoint_time_based_cesnet_dataset.DisjointTimeBasedCesnetDataset).
5454
check_errors: Whether to validate if the dataset is corrupted. `Default: False`
5555
display_details: Whether to display details about the available data in chosen dataset. `Default: False`
5656
5757
Returns:
58-
[`TimeBasedCesnetDataset`][cesnet_tszoo.datasets.time_based_cesnet_dataset.TimeBasedCesnetDataset], [`SeriesBasedCesnetDataset`][cesnet_tszoo.datasets.series_based_cesnet_dataset.SeriesBasedCesnetDataset] or [`DisjointTimeBasedCesnetDataset`][cesnet_tszoo.datasets.disjoint_time_based_cesnet_dataset.DisjointTimeBasedCesnetDataset].
58+
[`TimeBasedCesnetDataset`](reference_time_based_cesnet_dataset.md#cesnet_tszoo.datasets.time_based_cesnet_dataset.TimeBasedCesnetDataset), [`SeriesBasedCesnetDataset`](reference_series_based_cesnet_dataset.md#cesnet_tszoo.datasets.series_based_cesnet_dataset.SeriesBasedCesnetDataset) or [`DisjointTimeBasedCesnetDataset`](reference_disjoint_time_based_cesnet_dataset.md#cesnet_tszoo.datasets.disjoint_time_based_cesnet_dataset.DisjointTimeBasedCesnetDataset).
5959
"""
6060

6161
return super(CESNET_TimeSeries24, cls).get_dataset(data_root, source_type, aggregation, dataset_type, check_errors, display_details)

0 commit comments

Comments
 (0)