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

Remove isKey()

parent 463052c7
No related branches found
No related tags found
3 merge requests!30Release after RAL,!29After 2nd RAL submission,!21Resolve "follow core:#313"
...@@ -145,13 +145,12 @@ FrameBasePtrList ProcessorCloseloopIcp::selectCandidates(FrameBasePtr _keyframe_ ...@@ -145,13 +145,12 @@ FrameBasePtrList ProcessorCloseloopIcp::selectCandidates(FrameBasePtr _keyframe_
//Consider only key_frames from 1 to n - match_past_key_frame_ //Consider only key_frames from 1 to n - match_past_key_frame_
// std::copy_if(frames.begin(), frames.end(), std::back_inserter(candidates), [&](FrameBasePtr _frame) { if(_frame->isKey()) {key_frames_counter++; return (key_frames_counter % match_past_key_frame_ == 0); // std::copy_if(frames.begin(), frames.end(), std::back_inserter(candidates), [&](FrameBasePtr _frame) { if(_frame->isKey()) {key_frames_counter++; return (key_frames_counter % match_past_key_frame_ == 0);
// }else{ return false;};}); // }else{ return false;};});
for(auto it=trajectory->rbegin(); it != trajectory->rend(); it++){ for(auto it=trajectory->rbegin(); it != trajectory->rend(); it++)
if((*it)->isKey()){ {
// WOLF_DEBUG("TIMESTAMP KEY FRAME ", (*it)->id(), " ", (*it)->getTimeStamp()); // WOLF_DEBUG("TIMESTAMP KEY FRAME ", (*it)->id(), " ", (*it)->getTimeStamp());
key_frames_counter++; key_frames_counter++;
if (key_frames_counter > recent_key_frames_ignored_ if (key_frames_counter > recent_key_frames_ignored_
and (_keyframe_ptr->getP()->getState() - (*it)->getP()->getState()).norm() < laser_scan_params_.range_max_) candidates.push_back(*it); and (_keyframe_ptr->getP()->getState() - (*it)->getP()->getState()).norm() < laser_scan_params_.range_max_) candidates.push_back(*it);
}
} }
WOLF_DEBUG("%%%%%%%%%%%%%%%%%% CANDIDATES SIZE ", candidates.size()); WOLF_DEBUG("%%%%%%%%%%%%%%%%%% CANDIDATES SIZE ", candidates.size());
return candidates; return candidates;
......
...@@ -160,20 +160,14 @@ TEST_F(ProcessorOdomIcp_Test, solve) ...@@ -160,20 +160,14 @@ TEST_F(ProcessorOdomIcp_Test, solve)
} }
for (auto F : *problem->getTrajectory()) for (auto F : *problem->getTrajectory())
{ F->perturb(0.5);
if (F->isKey())
F->perturb(0.5);
}
std::string report = solver->solve(SolverManager::ReportVerbosity::BRIEF); std::string report = solver->solve(SolverManager::ReportVerbosity::BRIEF);
WOLF_TRACE(report); WOLF_TRACE(report);
for (auto F : *problem->getTrajectory()) for (auto F : *problem->getTrajectory())
{ {
if (F->isKey()) ASSERT_MATRIX_APPROX(F->getState().vector("PO") , x0.vector("PO") , 1e-6);
{
ASSERT_MATRIX_APPROX(F->getState().vector("PO") , x0.vector("PO") , 1e-6);
}
} }
} }
......
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