Skip to content
Snippets Groups Projects
Commit a4d5c236 authored by Sergi Pujol's avatar Sergi Pujol
Browse files

falkolib commit updated, some refactor

parent 43282a1c
No related branches found
No related tags found
1 merge request!4Resolve "Implementation of Falko lib"
Subproject commit 327bafa8ee1d9ea545d9766415986ea13a1064d1
Subproject commit 0017c6c5be963b923684bfd8eb6bd8b7641ba1b6
......@@ -36,8 +36,8 @@ public:
/** \brief update the scene struct with keypoints and descriptors
**/
virtual sceneBasePtr extractScene(LaserScan &scan,
LaserScanParams &scanParams) = 0;
virtual sceneBasePtr extractScene(const LaserScan &scan,
const LaserScanParams &scanParams) = 0;
/** \brief Create and update a matchLoopClosure struct with the info that is
*produced when matching two given scenes
......
......@@ -39,9 +39,7 @@
namespace laserscanutils {
typedef falkolib::BSC bsc;
typedef falkolib::BSCExtractor<falkolib::FALKO> bscExtractor;
typedef falkolib::CGH cgh;
typedef falkolib::CGHExtractor<falkolib::FALKO> cghExtractor;
template <typename T, typename D> using nn_matcher = falkolib::NNMatcher<T, D>;
......@@ -122,8 +120,8 @@ public:
/** \brief Create and update the scene struct with keypoints and descriptors
**/
sceneBasePtr extractScene(LaserScan &_scan,
LaserScanParams &_scan_params) override {
sceneBasePtr extractScene(const LaserScan &_scan,
const LaserScanParams &_scan_params) override {
auto new_scene = std::make_shared<SceneFalko<D>>();
auto scan_falko = convert2LaserScanFALKO(_scan, _scan_params);
// Extract keypoints
......@@ -137,8 +135,8 @@ public:
/** \brief Convert scans from laserscanutils::LaserScan to
*falkolib::LaserScan object
**/
laserScanPtr convert2LaserScanFALKO(LaserScan &_scan,
LaserScanParams &_scan_params) {
laserScanPtr convert2LaserScanFALKO(const LaserScan &_scan,
const LaserScanParams &_scan_params) {
auto scan_falko = std::make_shared<falkolib::LaserScan>(
_scan_params.angle_min_, _scan_params.angle_max_,
_scan.ranges_raw_.size());
......
......@@ -35,6 +35,9 @@
namespace laserscanutils {
typedef falkolib::BSC bsc;
typedef falkolib::CGH cgh;
template <typename D> struct SceneFalko : public SceneBase {
std::vector<falkolib::FALKO> keypoints_list_;
std::vector<D> descriptors_list_;
......
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