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
50498f34
Commit
50498f34
authored
5 years ago
by
Joaquim Casals Buñuel
Browse files
Options
Downloads
Patches
Plain Diff
Made CSM optional
parent
d61637c5
No related branches found
No related tags found
1 merge request
!1
Resolve "icp: develop matching tools"
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/CMakeLists.txt
+14
-5
14 additions, 5 deletions
src/CMakeLists.txt
src/icp.cpp
+1
-0
1 addition, 0 deletions
src/icp.cpp
with
15 additions
and
5 deletions
src/CMakeLists.txt
+
14
−
5
View file @
50498f34
...
...
@@ -10,10 +10,12 @@ IF(faramotics_FOUND)
MESSAGE
(
"Faramotics Library FOUND: Tests requiring it will be built."
)
ENDIF
(
faramotics_FOUND
)
FIND_PACKAGE
(
csm
RE
QUI
RED
)
FIND_PACKAGE
(
csm QUI
ET
)
#include directories
INCLUDE_DIRECTORIES
(
.
)
INCLUDE_DIRECTORIES
(
${
csm_INCLUDE_DIR
}
)
IF
(
csm_FOUND
)
INCLUDE_DIRECTORIES
(
${
csm_INCLUDE_DIR
}
)
ENDIF
(
csm_FOUND
)
IF
(
Ceres_FOUND
)
INCLUDE_DIRECTORIES
(
${
CERES_INCLUDE_DIRS
}
)
ENDIF
(
Ceres_FOUND
)
...
...
@@ -41,7 +43,11 @@ SET(HDRS
point_set.h
polyline.h
scan_segment.h
icp.h
)
)
IF
(
csm_FOUND
)
SET
(
HDRS
${
HDRS
}
icp.h
)
ENDIF
(
csm_FOUND
)
#sources
SET
(
SRCS
...
...
@@ -60,8 +66,11 @@ SET(SRCS
point_set.cpp
polyline.cpp
scan_segment.cpp
icp.cpp
)
)
IF
(
csm_FOUND
)
SET
(
SRCS
${
SRCS
}
icp.cpp
)
ENDIF
(
csm_FOUND
)
# create the shared library
ADD_LIBRARY
(
${
PROJECT_NAME
}
SHARED
${
SRCS
}
)
target_link_libraries
(
${
PROJECT_NAME
}
${
csm_LIBRARY
}
)
...
...
This diff is collapsed.
Click to expand it.
src/icp.cpp
+
1
−
0
View file @
50498f34
...
...
@@ -88,6 +88,7 @@ icpOutput ICP::align(const LaserScan &_last_ls, const LaserScan &_origin_ls, con
csm_input
.
outliers_adaptive_order
=
icp_params
.
outliers_adaptive_order
;
csm_input
.
outliers_adaptive_mult
=
icp_params
.
outliers_adaptive_mult
;
csm_input
.
do_compute_covariance
=
1
;
sm_icp
(
&
csm_input
,
&
csm_output
);
...
...
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