[ML] Provide factory setup for creating models #1527
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||
|---|---|---|---|---|---|---|
|
|
@@ -187,53 +187,21 @@ class CTestFixture : public CModelTestFixtureBase { | |||||
| core_t::TTime startTime, | ||||||
| std::size_t numberPeople, | ||||||
| const std::string& summaryCountField = EMPTY_STRING) { | ||||||
| this->makeModelT<CEventRateModelFactory>(params, features, startTime, | ||||||
| model_t::E_EventRateOnline, m_Gatherer, | ||||||
| m_Model, {}, summaryCountField); | ||||||
|
|
||||||
| for (std::size_t i = 0u; i < numberPeople; ++i) { | ||||||
| BOOST_REQUIRE_EQUAL( | ||||||
| std::size_t(i), | ||||||
|
There was a problem hiding this comment.
Suggested change
|
||||||
| this->addPerson("p" + core::CStringUtils::typeToString(i + 1), m_Gatherer)); | ||||||
| } | ||||||
| } | ||||||
|
|
||||||
| protected: | ||||||
| using TDoubleSizeStrTr = core::CTriple<double, std::size_t, std::string>; | ||||||
| using TMinAccumulator = maths::CBasicStatistics::COrderStatisticsHeap<TDoubleSizeStrTr>; | ||||||
| using TMinAccumulatorVec = std::vector<TMinAccumulator>; | ||||||
| }; | ||||||
|
|
||||||
| BOOST_FIXTURE_TEST_CASE(testCountSample, CTestFixture) { | ||||||
|
|
@@ -986,12 +954,15 @@ BOOST_FIXTURE_TEST_CASE(testPrune, CTestFixture) { | |||||
| features.push_back(model_t::E_IndividualTotalBucketCountByPerson); | ||||||
| CModelFactory::TDataGathererPtr gatherer; | ||||||
| CModelFactory::TModelPtr model_; | ||||||
| this->makeModelT<CEventRateModelFactory>( | ||||||
| params, features, startTime, model_t::E_EventRateOnline, gatherer, model_); | ||||||
| CEventRateModel* model = dynamic_cast<CEventRateModel*>(model_.get()); | ||||||
| BOOST_TEST_REQUIRE(model); | ||||||
| CModelFactory::TDataGathererPtr expectedGatherer; | ||||||
| CModelFactory::TModelPtr expectedModel_; | ||||||
| this->makeModelT<CEventRateModelFactory>(params, features, startTime, | ||||||
| model_t::E_EventRateOnline, | ||||||
| expectedGatherer, expectedModel_); | ||||||
| CEventRateModel* expectedModel = | ||||||
| dynamic_cast<CEventRateModel*>(expectedModel_.get()); | ||||||
| BOOST_TEST_REQUIRE(expectedModel); | ||||||
|
|
@@ -2026,8 +1997,15 @@ BOOST_FIXTURE_TEST_CASE(testSkipSampling, CTestFixture) { | |||||
| model_t::TFeatureVec features{feature}; | ||||||
| CModelFactory::TDataGathererPtr gathererNoGap; | ||||||
| CModelFactory::TModelPtr modelNoGap_; | ||||||
| this->makeModelT<CEventRateModelFactory>(params, features, startTime, | ||||||
| model_t::E_EventRateOnline, | ||||||
| gathererNoGap, modelNoGap_); | ||||||
| CEventRateModel* modelNoGap = dynamic_cast<CEventRateModel*>(modelNoGap_.get()); | ||||||
| for (std::size_t i = 0u; i < 2; ++i) { | ||||||
| BOOST_REQUIRE_EQUAL( | ||||||
| std::size_t(i), | ||||||
|
There was a problem hiding this comment.
Suggested change
|
||||||
| this->addPerson("p" + core::CStringUtils::typeToString(i + 1), gathererNoGap)); | ||||||
| } | ||||||
|
|
||||||
| // p1: |1|1|1| | ||||||
| // p2: |1|0|0| | ||||||
|
|
@@ -2041,8 +2019,15 @@ BOOST_FIXTURE_TEST_CASE(testSkipSampling, CTestFixture) { | |||||
|
|
||||||
| CModelFactory::TDataGathererPtr gathererWithGap; | ||||||
| CModelFactory::TModelPtr modelWithGap_; | ||||||
| this->makeModelT<CEventRateModelFactory>(params, features, startTime, | ||||||
| model_t::E_EventRateOnline, | ||||||
| gathererWithGap, modelWithGap_); | ||||||
| CEventRateModel* modelWithGap = dynamic_cast<CEventRateModel*>(modelWithGap_.get()); | ||||||
| for (std::size_t i = 0u; i < 2; ++i) { | ||||||
| BOOST_REQUIRE_EQUAL( | ||||||
| std::size_t(i), | ||||||
|
There was a problem hiding this comment.
Suggested change
|
||||||
| this->addPerson("p" + core::CStringUtils::typeToString(i + 1), gathererWithGap)); | ||||||
| } | ||||||
|
|
||||||
| // p1: |1|1|0|0|0|0|0|0|0|0|1|1| | ||||||
| // p1: |1|X|X|X|X|X|X|X|X|X|1|1| -> equal to |1|1|1| | ||||||
|
|
@@ -2108,8 +2093,9 @@ BOOST_FIXTURE_TEST_CASE(testExplicitNulls, CTestFixture) { | |||||
| model_t::TFeatureVec features{feature}; | ||||||
| CModelFactory::TDataGathererPtr gathererSkipGap; | ||||||
| CModelFactory::TModelPtr modelSkipGap_; | ||||||
| this->makeModelT<CEventRateModelFactory>(params, features, startTime, | ||||||
| model_t::E_EventRateOnline, gathererSkipGap, | ||||||
| modelSkipGap_, {}, summaryCountField); | ||||||
| CEventRateModel* modelSkipGap = dynamic_cast<CEventRateModel*>(modelSkipGap_.get()); | ||||||
|
|
||||||
| // The idea here is to compare a model that has a gap skipped against a model | ||||||
|
|
@@ -2137,8 +2123,9 @@ BOOST_FIXTURE_TEST_CASE(testExplicitNulls, CTestFixture) { | |||||
|
|
||||||
| CModelFactory::TDataGathererPtr gathererExNull; | ||||||
| CModelFactory::TModelPtr modelExNullGap_; | ||||||
| this->makeModelT<CEventRateModelFactory>(params, features, startTime, | ||||||
| model_t::E_EventRateOnline, gathererExNull, | ||||||
| modelExNullGap_, {}, summaryCountField); | ||||||
| CEventRateModel* modelExNullGap = | ||||||
| dynamic_cast<CEventRateModel*>(modelExNullGap_.get()); | ||||||
|
|
||||||
|
|
@@ -2413,14 +2400,17 @@ BOOST_FIXTURE_TEST_CASE(testSummaryCountZeroRecordsAreIgnored, CTestFixture) { | |||||
|
|
||||||
| CModelFactory::TDataGathererPtr gathererWithZeros; | ||||||
| CModelFactory::TModelPtr modelWithZerosPtr; | ||||||
| this->makeModelT<CEventRateModelFactory>( | ||||||
| params, {model_t::E_IndividualCountByBucketAndPerson}, startTime, | ||||||
| model_t::E_EventRateOnline, gathererWithZeros, modelWithZerosPtr, {}, | ||||||
| summaryCountField); | ||||||
| CEventRateModel& modelWithZeros = static_cast<CEventRateModel&>(*modelWithZerosPtr); | ||||||
|
|
||||||
| CModelFactory::TDataGathererPtr gathererNoZeros; | ||||||
| CModelFactory::TModelPtr modelNoZerosPtr; | ||||||
| this->makeModelT<CEventRateModelFactory>( | ||||||
| params, {model_t::E_IndividualCountByBucketAndPerson}, startTime, | ||||||
| model_t::E_EventRateOnline, gathererNoZeros, modelNoZerosPtr, {}, summaryCountField); | ||||||
| CEventRateModel& modelNoZeros = static_cast<CEventRateModel&>(*modelNoZerosPtr); | ||||||
|
|
||||||
| // The idea here is to compare a model that has records with summary count of zero | ||||||
|
|
||||||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
There's no need to cast expected types with Boost.Test. The places where we do this in existing code are a hangover from CppUnit.