Merge branch 'master' into issue-533

tinkoff-ai · Mar 14, 2022 · 89a3182 · 89a3182
2 parents 34dbcf7 + 4e50849
commit 89a3182
Show file tree

Hide file tree

Showing 12 changed files with 60,292 additions and 1,863 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -21,6 +21,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - 
 - Create `PerSegmentBaseModel`, `PerSegmentPredictionIntervalModel` ([#537](https://github.com/tinkoff-ai/etna/pull/537))
 - Create `MultiSegmentModel` ([#551](https://github.com/tinkoff-ai/etna/pull/551))
+- 
+- Add regressors example notebook ([#577](https://github.com/tinkoff-ai/etna/pull/577))
 - Create `EnsembleMixin` ([#574](https://github.com/tinkoff-ai/etna/pull/574))
 - 
 - Add option `season_number` to DateFlagsTransform ([#567](https://github.com/tinkoff-ai/etna/pull/567))
@@ -57,11 +59,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Fix `TSDataset.info`, `TSDataset.describe` methods ([#519](https://github.com/tinkoff-ai/etna/pull/519))
 - Fix regressors handling for `OneHotEncoderTransform` and `HolidayTransform` ([#518](https://github.com/tinkoff-ai/etna/pull/518))
 - Fix wandb summary issue with custom plots ([#535](https://github.com/tinkoff-ai/etna/pull/535))
-- 
+- Small notebook fixes ([#595](https://github.com/tinkoff-ai/etna/pull/595))
 - 
 - Fix import Literal in plotters ([#558](https://github.com/tinkoff-ai/etna/pull/558))
 - 
-- 
+- Fix plot method bug when plot method does not plot all required segments ([#596](https://github.com/tinkoff-ai/etna/pull/596))
 - 
 - [BUG] nn models make forecast without inverse_transform ([#541](https://github.com/tinkoff-ai/etna/pull/541))
 

diff --git a/etna/datasets/tsdataset.py b/etna/datasets/tsdataset.py
@@ -465,7 +465,9 @@ def plot(
         """
         if not segments:
             segments = self.segments
-        k = min(n_segments, len(segments))
+            k = min(n_segments, len(segments))
+        else:
+            k = len(segments)
         columns_num = min(2, k)
         rows_num = math.ceil(k / columns_num)
         start = self.df.index.min() if start is None else pd.Timestamp(start)

diff --git a/examples/EDA.ipynb b/examples/EDA.ipynb
diff --git a/examples/backtest.ipynb b/examples/backtest.ipynb
diff --git a/examples/clustering.ipynb b/examples/clustering.ipynb
diff --git a/examples/data/README.md b/examples/data/README.md
@@ -0,0 +1,8 @@
+This is a data folder for testing various functionalities in ETNA.
+
+1. nordic_merch_sales.csv
+
+    See more details at https://www.kaggle.com/c/tabular-playground-series-jan-2022/
+2. nordic_weather.csv
+
+    See more details at https://www.kaggle.com/adamwurdits/finland-norway-and-sweden-weather-data-20152019
diff --git a/examples/data/nordic_merch_sales.csv b/examples/data/nordic_merch_sales.csv
diff --git a/examples/data/nordics_weather.csv b/examples/data/nordics_weather.csv
diff --git a/examples/ensembles.ipynb b/examples/ensembles.ipynb
diff --git a/examples/exogenous_data.ipynb b/examples/exogenous_data.ipynb
diff --git a/examples/get_started.ipynb b/examples/get_started.ipynb
diff --git a/examples/outliers.ipynb b/examples/outliers.ipynb