[ML] Provide factory setup for creating models #1527
Merged
Conversation
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
Move boilerplate code for creating models to a base class method. This goes some way to reducing duplicated code and standardizing how models are created.
droberts195
reviewed
Oct 12, 2020
| this->makeModel(params, features, startTime); | ||
| CCountingModel* modelNoGap = dynamic_cast<CCountingModel*>(m_Model.get()); | ||
| BOOST_TEST_REQUIRE(modelNoGap); | ||
| BOOST_REQUIRE_EQUAL(std::size_t(0), this->addPerson("p", m_Gatherer)); |
There was a problem hiding this comment.
Suggested change
| BOOST_REQUIRE_EQUAL(std::size_t(0), this->addPerson("p", m_Gatherer)); | |
| BOOST_REQUIRE_EQUAL(0, this->addPerson("p", m_Gatherer)); |
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.
| this->makeModel(params, features, startTime); | ||
| CCountingModel* modelNoGap = dynamic_cast<CCountingModel*>(m_Model.get()); | ||
| BOOST_TEST_REQUIRE(modelNoGap); | ||
| BOOST_REQUIRE_EQUAL(std::size_t(0), this->addPerson("p", m_Gatherer)); |
There was a problem hiding this comment.
Suggested change
| BOOST_REQUIRE_EQUAL(std::size_t(0), this->addPerson("p", m_Gatherer)); | |
| BOOST_REQUIRE_EQUAL(0, this->addPerson("p", m_Gatherer)); |
Comment on lines
227
to
228
| BOOST_REQUIRE_EQUAL(std::size_t(0), this->addPerson("p1", m_Gatherer)); | ||
| BOOST_REQUIRE_EQUAL(std::size_t(1), this->addPerson("p2", m_Gatherer)); |
There was a problem hiding this comment.
Suggested change
| BOOST_REQUIRE_EQUAL(std::size_t(0), this->addPerson("p1", m_Gatherer)); | |
| BOOST_REQUIRE_EQUAL(std::size_t(1), this->addPerson("p2", m_Gatherer)); | |
| BOOST_REQUIRE_EQUAL(0, this->addPerson("p1", m_Gatherer)); | |
| BOOST_REQUIRE_EQUAL(1, this->addPerson("p2", m_Gatherer)); |
| 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
| std::size_t(i), | |
| i, |
| model.reset(m_Factory->makeModel({gatherer})); | ||
| BOOST_TEST_REQUIRE(model); | ||
| BOOST_REQUIRE_EQUAL(model_t::E_EventRateOnline, model->category()); | ||
| BOOST_REQUIRE_EQUAL(params.s_BucketLength, model->bucketLength()); | ||
| 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
| std::size_t(i), | |
| i, |
| 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
| std::size_t(i), | |
| i, |
|
|
||
| protected: | ||
| using TInterimBucketCorrectorPtr = std::shared_ptr<ml::model::CInterimBucketCorrector>; | ||
| using TModelFactoryPtr = boost::shared_ptr<ml::model::CModelFactory>; |
There was a problem hiding this comment.
Why is this using boost::shared_ptr? If there's a good reason, e.g. it's used with some other Boost library that has boost::shared_ptr in its interface, please add a comment.
* remove unnecessary type conversions from * replace boost constructs with standard library equivalents
edsavage
added a commit
to edsavage/ml-cpp
that referenced
this pull request
Oct 13, 2020
Move boilerplate code for creating models to a base class method. This goes some way to reducing duplicated code and standardizing how models are created in the tests.
edsavage
added a commit
that referenced
this pull request
Oct 13, 2020
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Move boilerplate code for creating models to a base class method.
This goes some way to reducing duplicated code and standardising how models are created.
Relates to #1477