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

use_descriptors if rectified

parent d754a078
No related branches found
No related tags found
1 merge request!4Resolve "Implementation of Falko lib"
...@@ -26,13 +26,6 @@ ...@@ -26,13 +26,6 @@
/************************** /**************************
* Falko includes * * Falko includes *
**************************/ **************************/
#include <falkolib/Feature/BSC.h>
#include <falkolib/Feature/CGH.h>
#include <falkolib/Feature/FALKO.h>
#include <falkolib/Feature/FALKOExtractor.h>
#include <falkolib/Feature/BSCExtractor.h>
#include <falkolib/Feature/CGHExtractor.h>
#include <falkolib/Matching/AHTMatcher.h> #include <falkolib/Matching/AHTMatcher.h>
#include <falkolib/Matching/NNMatcher.h> #include <falkolib/Matching/NNMatcher.h>
...@@ -50,8 +43,8 @@ template <typename T, typename D> using aht_matcher = falkolib::AHTMatcher<T, D> ...@@ -50,8 +43,8 @@ template <typename T, typename D> using aht_matcher = falkolib::AHTMatcher<T, D>
struct ParameterLoopClosureFalko struct ParameterLoopClosureFalko
{ {
// Keypoints extractor Default // Keypoints extractor Default
double min_extraction_range_ = 0.1; double min_extraction_range_ = 0;
double max_extraction_range_ = 25; double max_extraction_range_ = 30;
bool enable_subbeam_ = true; bool enable_subbeam_ = true;
double nms_radius_ = 0.1; double nms_radius_ = 0.1;
double neigh_b_ = 0.01; double neigh_b_ = 0.01;
...@@ -176,12 +169,12 @@ class LoopClosureFalko : public LoopClosureBase2d, public falkolib::FALKOExtract ...@@ -176,12 +169,12 @@ class LoopClosureFalko : public LoopClosureBase2d, public falkolib::FALKOExtract
int matching_number = 0; int matching_number = 0;
if (use_descriptors_ == 1) if (use_descriptors_ == 0)
{ {
matching_number = matching_number =
matcher_.match(scene_1_falko->keypoints_list_, scene_2_falko->keypoints_list_, asso_nn); matcher_.match(scene_1_falko->keypoints_list_, scene_2_falko->keypoints_list_, asso_nn);
} }
else if (use_descriptors_ == 0) else if (use_descriptors_ == 1)
{ {
matching_number = matching_number =
matcher_.match(scene_1_falko->keypoints_list_, scene_1_falko->descriptors_list_, matcher_.match(scene_1_falko->keypoints_list_, scene_1_falko->descriptors_list_,
......
...@@ -22,28 +22,22 @@ ...@@ -22,28 +22,22 @@
/************************** /**************************
* Falko includes * * Falko includes *
**************************/ **************************/
#include <falkolib/Feature/BSC.h>
#include <falkolib/Feature/CGH.h>
#include <falkolib/Feature/FALKO.h>
#include <falkolib/Feature/FALKOExtractor.h>
#include <falkolib/Feature/FALKOExtractor.h>
#include <falkolib/Feature/BSCExtractor.h> #include <falkolib/Feature/BSCExtractor.h>
#include <falkolib/Feature/CGHExtractor.h> #include <falkolib/Feature/CGHExtractor.h>
#include <falkolib/Matching/AHTMatcher.h>
#include <falkolib/Matching/NNMatcher.h>
namespace laserscanutils { namespace laserscanutils {
typedef falkolib::BSC bsc; typedef falkolib::BSC bsc;
typedef falkolib::CGH cgh; typedef falkolib::CGH cgh;
template <typename D> struct SceneFalko : public SceneBase { template <typename D> struct SceneFalko : public SceneBase
std::vector<falkolib::FALKO> keypoints_list_; {
std::vector<D> descriptors_list_; std::vector<falkolib::FALKO> keypoints_list_;
std::vector<D> descriptors_list_;
}; };
} /* namespace laserscanutils */ } /* namespace laserscanutils */
#endif /* SCENE_FALKO_H_ */ #endif /* SCENE_FALKO_H_ */
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