Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
laser_scan_utils
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Operate
Environments
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
labrobotica
algorithms
laser_scan_utils
Commits
c5e90bda
Commit
c5e90bda
authored
4 years ago
by
Sergi Pujol Badell
Browse files
Options
Downloads
Patches
Plain Diff
use_descriptors if rectified
parent
d754a078
No related branches found
Branches containing commit
No related tags found
1 merge request
!4
Resolve "Implementation of Falko lib"
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/loop_closure_falko.h
+4
-11
4 additions, 11 deletions
src/loop_closure_falko.h
src/scene_falko.h
+5
-11
5 additions, 11 deletions
src/scene_falko.h
with
9 additions
and
22 deletions
src/loop_closure_falko.h
+
4
−
11
View file @
c5e90bda
...
@@ -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_
,
...
...
This diff is collapsed.
Click to expand it.
src/scene_falko.h
+
5
−
11
View file @
c5e90bda
...
@@ -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_ */
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment