Skip to content
Snippets Groups Projects
Commit 30ac7955 authored by Joan Solà Ortega's avatar Joan Solà Ortega
Browse files

Remove FrameBase::createNonKeyFrame

parent 00915859
No related branches found
No related tags found
1 merge request!403Resolve "Merge Aux/KeyFrames into Estimated Frames"
Pipeline #6196 failed
......@@ -126,8 +126,6 @@ class FrameBase : public NodeBase, public HasStateBlocks, public std::enable_sha
void link(TrajectoryBasePtr);
template<typename classType, typename... T>
static std::shared_ptr<classType> emplaceFrame(TrajectoryBasePtr _ptr, T&&... all);
template<typename classType, typename... T>
static std::shared_ptr<classType> createNonKeyFrame(T&&... all);
virtual void printHeader(int depth, //
bool constr_by, //
......@@ -175,13 +173,6 @@ std::shared_ptr<classType> FrameBase::emplaceFrame(TrajectoryBasePtr _ptr, T&&..
return frm;
}
template<typename classType, typename... T>
std::shared_ptr<classType> FrameBase::createNonKeyFrame(T&&... all)
{
std::shared_ptr<classType> frm = std::make_shared<classType>(std::forward<T>(all)...);
return frm;
}
inline unsigned int FrameBase::id() const
{
return frame_id_;
......
......@@ -432,9 +432,9 @@ void ProcessorMotion::processCapture(CaptureBasePtr _incoming_ptr)
auto factor = emplaceFactor(key_feature, origin_ptr_);
// create a new frame
auto frame_new = FrameBase::createNonKeyFrame<FrameBase>(getTimeStamp(),
getStateStructure(),
getProblem()->getState());
auto frame_new = std::make_shared<FrameBase>(getTimeStamp(),
getStateStructure(),
getProblem()->getState());
// create a new capture
auto capture_new = emplaceCapture(frame_new,
getSensor(),
......@@ -692,9 +692,9 @@ void ProcessorMotion::setOrigin(FrameBasePtr _origin_frame)
// ---------- LAST ----------
// Make non-key-frame for last Capture
last_frame_ptr_ = FrameBase::createNonKeyFrame<FrameBase>(origin_ts,
getStateStructure(),
_origin_frame->getState());
last_frame_ptr_ = std::make_shared<FrameBase>(origin_ts,
getStateStructure(),
_origin_frame->getState());
// emplace (emtpy) last Capture
last_ptr_ = emplaceCapture(last_frame_ptr_,
......
......@@ -114,9 +114,9 @@ void ProcessorTracker::processCapture(CaptureBasePtr _incoming_ptr)
{
WOLF_DEBUG( "PT ", getName(), " SECOND_TIME_WITHOUT_PACK" );
FrameBasePtr frm = FrameBase::createNonKeyFrame<FrameBase>(incoming_ptr_->getTimeStamp(),
getProblem()->getFrameStructure(),
getProblem()->getState());
FrameBasePtr frm = std::make_shared<FrameBase>(incoming_ptr_->getTimeStamp(),
getProblem()->getFrameStructure(),
getProblem()->getState());
incoming_ptr_->link(frm);
// We have a last_ Capture with no features, so we do not process known features, and we do not vote for KF.
......
......@@ -37,11 +37,11 @@ class TrackMatrixTest : public testing::Test
// unlinked frames
// Some warnings will be thrown "linking with nullptr" for emplacing without providing frame pointer
F0 = FrameBase::createNonKeyFrame<FrameBase>(0.0, nullptr);
F1 = FrameBase::createNonKeyFrame<FrameBase>(1.0, nullptr);
F2 = FrameBase::createNonKeyFrame<FrameBase>(2.0, nullptr);
F3 = FrameBase::createNonKeyFrame<FrameBase>(3.0, nullptr);
F4 = FrameBase::createNonKeyFrame<FrameBase>(4.0, nullptr);
F0 = std::make_shared<FrameBase>(0.0, nullptr);
F1 = std::make_shared<FrameBase>(1.0, nullptr);
F2 = std::make_shared<FrameBase>(2.0, nullptr);
F3 = std::make_shared<FrameBase>(3.0, nullptr);
F4 = std::make_shared<FrameBase>(4.0, nullptr);
// unlinked features
// Some warnings will be thrown "linking with nullptr" for emplacing without providing capture pointer
......
......@@ -35,12 +35,12 @@ TEST(TrajectoryBase, ClosestKeyFrame)
FrameBasePtr F1 = P->emplaceFrame( 1, Eigen::Vector3d::Zero() );
FrameBasePtr F2 = P->emplaceFrame( 2, Eigen::Vector3d::Zero() );
// FrameBasePtr F3 = P->emplaceFrame(AUXILIARY, 3, Eigen::Vector3d::Zero() );
FrameBasePtr F3 = FrameBase::createNonKeyFrame<FrameBase>(3, P->getFrameStructure(),
// P->getDim(),
std::list<VectorXd>({Eigen::Vector2d::Zero(),Eigen::Vector1d::Zero()}) );
FrameBasePtr F4 = FrameBase::createNonKeyFrame<FrameBase>(4, P->getFrameStructure(),
// P->getDim(),
std::list<VectorXd>({Eigen::Vector2d::Zero(),Eigen::Vector1d::Zero()}) );
FrameBasePtr F3 = std::make_shared<FrameBase>(3, P->getFrameStructure(),
// P->getDim(),
std::list<VectorXd>({Eigen::Vector2d::Zero(),Eigen::Vector1d::Zero()}) );
FrameBasePtr F4 = std::make_shared<FrameBase>(4, P->getFrameStructure(),
// P->getDim(),
std::list<VectorXd>({Eigen::Vector2d::Zero(),Eigen::Vector1d::Zero()}) );
FrameBasePtr KF; // closest key-frame queried
......@@ -94,9 +94,9 @@ TEST(TrajectoryBase, Add_Remove_Frame)
std::cout << __LINE__ << std::endl;
// add F3
FrameBasePtr F3 = FrameBase::createNonKeyFrame<FrameBase>(3, P->getFrameStructure(),
// P->getDim(),
std::list<VectorXd>({Eigen::Vector2d::Zero(),Eigen::Vector1d::Zero()}));
FrameBasePtr F3 = std::make_shared<FrameBase>(3, P->getFrameStructure(),
// P->getDim(),
std::list<VectorXd>({Eigen::Vector2d::Zero(),Eigen::Vector1d::Zero()}));
if (debug) P->print(2,0,0,0);
ASSERT_EQ(T->getFrameMap(). size(), (SizeStd) 2);
ASSERT_EQ(P->getStateBlockNotificationMapSize(), (SizeStd) 4);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment