Merge branch 'main' into bc_fix_notebooks

alteryx · Jan 5, 2021 · 2ba54cf · 2ba54cf
2 parents 00fe8b3 + 84b0214
commit 2ba54cf
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 2 deletions.
diff --git a/docs/source/release_notes.rst b/docs/source/release_notes.rst
@@ -15,6 +15,7 @@ Release Notes
         * Fixed AutoMLSearch stacktrace when a cutom objective was passed in as a primary objective or additional objective :pr:`1575`
         * Limit ``load_fraud`` dataset loaded into ``automl.ipynb`` :pr:`1646`
         * Fix custom index bug for ``MAPE`` objective :pr:`1641`
+        * Fixed bug where time series baseline estimators were not receiving ``gap`` and ``max_delay`` in ``AutoMLSearch`` :pr:`1645`
     * Changes
     * Documentation Changes
         * Updated docs to include information about ``AutoMLSearch`` callback parameters and methods :pr:`1577`

diff --git a/evalml/automl/automl_search.py b/evalml/automl/automl_search.py
@@ -623,7 +623,8 @@ def _add_baseline_pipelines(self):
         else:
             gap = self.problem_configuration['gap']
             max_delay = self.problem_configuration['max_delay']
-            baseline = TimeSeriesBaselineRegressionPipeline(parameters={"pipeline": {"gap": gap, "max_delay": max_delay}})
+            baseline = TimeSeriesBaselineRegressionPipeline(parameters={"pipeline": {"gap": gap, "max_delay": max_delay},
+                                                                        "Time Series Baseline Regressor": {"gap": gap, "max_delay": max_delay}})
         pipelines = [baseline]
         scores = self._evaluate_pipelines(pipelines, baseline=True)
         if scores == []:

diff --git a/evalml/tests/automl_tests/test_automl.py b/evalml/tests/automl_tests/test_automl.py
@@ -2032,3 +2032,17 @@ def test_automl_data_splitter_consistent(mock_binary_score, mock_binary_fit, moc
     assert data_splitters[0] == data_splitters[1]
     assert data_splitters[1] != data_splitters[2]
     assert data_splitters[2] == data_splitters[3]
+
+
+@patch('evalml.pipelines.TimeSeriesRegressionPipeline.fit')
+@patch('evalml.pipelines.TimeSeriesRegressionPipeline.score')
+def test_timeseries_baseline_init_with_correct_gap_max_delay(mock_fit, mock_score, X_y_regression):
+
+    X, y = X_y_regression
+    automl = AutoMLSearch(X_train=X, y_train=y, problem_type="time series regression",
+                          problem_configuration={"gap": 6, "max_delay": 3}, max_iterations=1)
+    automl.search()
+
+    # Best pipeline is baseline pipeline because we only run one iteration
+    assert automl.best_pipeline.parameters == {"pipeline": {"gap": 6, "max_delay": 3},
+                                               "Time Series Baseline Regressor": {"gap": 6, "max_delay": 3}}
diff --git a/evalml/tests/dependency_update_check/latest_dependency_versions.txt b/evalml/tests/dependency_update_check/latest_dependency_versions.txt
@@ -10,7 +10,7 @@ lightgbm==3.1.1
 matplotlib==3.3.3
 networkx==2.5
 nlp-primitives==1.1.0
-numpy==1.19.4
+numpy==1.19.5
 pandas==1.1.5
 plotly==4.14.1
 psutil==5.8.0