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
a4d5c236
Commit
a4d5c236
authored
4 years ago
by
Sergi Pujol
Browse files
Options
Downloads
Patches
Plain Diff
falkolib commit updated, some refactor
parent
43282a1c
No related branches found
No related tags found
1 merge request
!4
Resolve "Implementation of Falko lib"
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
deps/falkolib
+1
-1
1 addition, 1 deletion
deps/falkolib
src/loop_closure_base.h
+2
-2
2 additions, 2 deletions
src/loop_closure_base.h
src/loop_closure_falko.h
+4
-6
4 additions, 6 deletions
src/loop_closure_falko.h
src/scene_falko.h
+3
-0
3 additions, 0 deletions
src/scene_falko.h
with
10 additions
and
9 deletions
falkolib
@
0017c6c5
Compare
327bafa8
...
0017c6c5
Subproject commit
327bafa8ee1d9ea545d9766415986ea13a1064d1
Subproject commit
0017c6c5be963b923684bfd8eb6bd8b7641ba1b6
This diff is collapsed.
Click to expand it.
src/loop_closure_base.h
+
2
−
2
View file @
a4d5c236
...
...
@@ -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
...
...
This diff is collapsed.
Click to expand it.
src/loop_closure_falko.h
+
4
−
6
View file @
a4d5c236
...
...
@@ -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
());
...
...
This diff is collapsed.
Click to expand it.
src/scene_falko.h
+
3
−
0
View file @
a4d5c236
...
...
@@ -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_
;
...
...
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