[ML] Correct a bug in upgrade from pre 6.3 state for the lat_long fun…

…ction (elastic#1681) (elastic#1684)
edsavage · Jan 20, 2021 · 5ed5547 · 5ed5547
1 parent 4051fe5
commit 5ed5547
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 2 deletions.
diff --git a/docs/CHANGELOG.asciidoc b/docs/CHANGELOG.asciidoc
@@ -36,6 +36,8 @@
   if the time series has non-diurnal seasonality. (See {ml-pull}1634[#1634].)
 * Compute importance of hyperparameters optimized in the fine parameter tuning step.
   (See {ml-pull}1627[#1627].)
+* Correct upgrade for pre-6.3 state for lat_long anomaly anomaly detectors. (See
+  {ml-pull}1681[#1681].)
 
 == {es} version 7.11.0
 

diff --git a/include/maths/CTimeSeriesModel.h b/include/maths/CTimeSeriesModel.h
@@ -214,6 +214,9 @@ class MATHS_EXPORT CUnivariateTimeSeriesModel : public CModel {
 
     //! Get the residual model.
     const CPrior& residualModel() const;
+
+    //! Get the decay rate controllers.
+    const TDecayRateController2Ary* decayRateControllers() const;
     //@}
 
 private:
@@ -681,6 +684,9 @@ class MATHS_EXPORT CMultivariateTimeSeriesModel : public CModel {
 
     //! Get the residual model.
     const CMultivariatePrior& residualModel() const;
+
+    //! Get the decay rate controllers.
+    const TDecayRateController2Ary* decayRateControllers() const;
     //@}
 
 private:

diff --git a/lib/maths/CTimeSeriesModel.cc b/lib/maths/CTimeSeriesModel.cc
@@ -1451,6 +1451,11 @@ const CPrior& CUnivariateTimeSeriesModel::residualModel() const {
     return *m_ResidualModel;
 }
 
+const CUnivariateTimeSeriesModel::TDecayRateController2Ary*
+CUnivariateTimeSeriesModel::decayRateControllers() const {
+    return m_Controllers.get();
+}
+
 CUnivariateTimeSeriesModel::CUnivariateTimeSeriesModel(const CUnivariateTimeSeriesModel& other,
                                                        std::size_t id,
                                                        bool isForForecast)
@@ -2751,7 +2756,7 @@ bool CMultivariateTimeSeriesModel::acceptRestoreTraverser(const SModelRestorePar
             RESTORE_SETUP_TEARDOWN(
                 CONTROLLER_OLD_TAG,
                 m_Controllers = std::make_unique<TDecayRateController2Ary>(),
-                core::CPersistUtils::restore(CONTROLLER_6_3_TAG, *m_Controllers, traverser),
+                core::CPersistUtils::restore(CONTROLLER_OLD_TAG, *m_Controllers, traverser),
                 /**/)
             RESTORE_SETUP_TEARDOWN(
                 TREND_OLD_TAG, m_TrendModel.push_back(TDecompositionPtr()),
@@ -2849,6 +2854,11 @@ const CMultivariatePrior& CMultivariateTimeSeriesModel::residualModel() const {
     return *m_ResidualModel;
 }
 
+const CMultivariateTimeSeriesModel::TDecayRateController2Ary*
+CMultivariateTimeSeriesModel::decayRateControllers() const {
+    return m_Controllers.get();
+}
+
 CMultivariateTimeSeriesModel::EUpdateResult
 CMultivariateTimeSeriesModel::updateTrend(const CModelAddSamplesParams& params,
                                           const TTimeDouble2VecSizeTrVec& samples) {

diff --git a/lib/maths/unittest/CTimeSeriesModelTest.cc b/lib/maths/unittest/CTimeSeriesModelTest.cc
@@ -1762,7 +1762,7 @@ BOOST_AUTO_TEST_CASE(testPersist) {
     // TODO LOG_DEBUG(<< "Correlates");
 }
 
-BOOST_AUTO_TEST_CASE(testUpgrade) {
+BOOST_AUTO_TEST_CASE(testUpgradeFrom6p2) {
     // Test upgrade is minimally disruptive. We test the upgraded model
     // predicted confidence intervals verses the values we obtain from
     // the previous model. Note the confidence interval depends on both
@@ -1830,6 +1830,11 @@ BOOST_AUTO_TEST_CASE(testUpgrade) {
                     boost::lexical_cast<double>(interval[j]), 0.0001);
             }
         }
+        BOOST_TEST_REQUIRE(restoredModel.decayRateControllers() != nullptr);
+        BOOST_TEST_REQUIRE((*restoredModel.decayRateControllers())[0].checks() != 0);
+        BOOST_TEST_REQUIRE((*restoredModel.decayRateControllers())[1].checks() != 0);
+        BOOST_TEST_REQUIRE((*restoredModel.decayRateControllers())[0].dimension() == 1);
+        BOOST_TEST_REQUIRE((*restoredModel.decayRateControllers())[1].dimension() == 1);
     }
 
     LOG_DEBUG(<< "Multivariate");
@@ -1879,6 +1884,11 @@ BOOST_AUTO_TEST_CASE(testUpgrade) {
                     boost::lexical_cast<double>(interval[j]), 0.0001);
             }
         }
+        BOOST_TEST_REQUIRE(restoredModel.decayRateControllers() != nullptr);
+        BOOST_TEST_REQUIRE((*restoredModel.decayRateControllers())[0].checks() != 0);
+        BOOST_TEST_REQUIRE((*restoredModel.decayRateControllers())[1].checks() != 0);
+        BOOST_TEST_REQUIRE((*restoredModel.decayRateControllers())[0].dimension() == 3);
+        BOOST_TEST_REQUIRE((*restoredModel.decayRateControllers())[1].dimension() == 3);
     }
 }