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

implemented loopClosureFalko::extractScene with override

parent 5c065da6
No related branches found
No related tags found
1 merge request!4Resolve "Implementation of Falko lib"
This commit is part of merge request !4. Comments created here will be created in the context of that merge request.
...@@ -17,6 +17,7 @@ ...@@ -17,6 +17,7 @@
**************************/ **************************/
#include "laser_scan.h" #include "laser_scan.h"
#include "scene_base.h" #include "scene_base.h"
#include "scene_falko.h"
/************************** /**************************
* Falko includes * * Falko includes *
...@@ -52,11 +53,11 @@ public: ...@@ -52,11 +53,11 @@ public:
/** \brief compare new scans against the trained set in order to find loop closures /** \brief compare new scans against the trained set in order to find loop closures
**/ **/
//virtual void findLoopClosure(std::list<cornerScene>& scenes, const cornerScene newScene){} //virtual void findLoopClosure(std::list<cornerScene>& scenes, const cornerScene newScene){}
virtual void findLoopClosure(){} //virtual void findLoopClosure(){}
/** \brief update the scene struct with keypoints and descriptors /** \brief update the scene struct with keypoints and descriptors
**/ **/
//virtual void extractScene(LaserScan &scan,LaserScanParams &scanParams){} virtual std::shared_ptr<sceneFalko<falkolib::BSC>> extractScene(LaserScan &scan,LaserScanParams &scanParams){}
/** \brief Convert scans from laserscanutils::LaserScan to falkolib::LaserScan object /** \brief Convert scans from laserscanutils::LaserScan to falkolib::LaserScan object
**/ **/
......
...@@ -51,7 +51,6 @@ private: ...@@ -51,7 +51,6 @@ private:
public: public:
Extr extractor_; Extr extractor_;
M matcher_; M matcher_;
int test=1;
/** \brief Constructor /** \brief Constructor
**/ **/
...@@ -67,7 +66,7 @@ public: ...@@ -67,7 +66,7 @@ public:
/** \brief update the scene struct with keypoints and descriptors /** \brief update the scene struct with keypoints and descriptors
**/ **/
std::shared_ptr<sceneFalko<D>> extractScene(LaserScan &scan,LaserScanParams &scanParams); std::shared_ptr<sceneFalko<D>> extractScene(LaserScan &scan,LaserScanParams &scanParams) override;
}; };
......
...@@ -18,6 +18,7 @@ namespace laserscanutils ...@@ -18,6 +18,7 @@ namespace laserscanutils
struct sceneBase{ struct sceneBase{
//std::vector<falkolib::FALKO> keypointsList; //std::vector<falkolib::FALKO> keypointsList;
//std::vector<D> descriptorsList; //std::vector<D> descriptorsList;
std::vector<double> test;
}; };
......
...@@ -35,7 +35,7 @@ namespace laserscanutils ...@@ -35,7 +35,7 @@ namespace laserscanutils
{ {
template <typename D> template <typename D>
struct sceneFalko : sceneBase{ struct sceneFalko : public sceneBase{
std::vector<falkolib::FALKO> keypointsList; std::vector<falkolib::FALKO> keypointsList;
std::vector<D> descriptorsList; std::vector<D> descriptorsList;
}; };
......
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