-
Notifications
You must be signed in to change notification settings - Fork 41
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Add TerrainSimplification and TerrainSimplificationRos packages #5
Open
oliwiermelon
wants to merge
64
commits into
master
Choose a base branch
from
add-terrain-simplification
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
64 commits
Select commit
Hold shift + click to select a range
6660160
Add TerrainSimplification and TerrainSimplificationRos packages
c93e508
Create README.md
oliwiermelon b4c9391
Check that the queried position is inside the map
c7a61f4
Add ros server to get a value from a map at a position, create a srv
e676deb
Merge branch 'add-terrain-simplification' of github.com:ori-drs/plane…
55810e6
[TerrainSimplification] change from boost::shared_mutex to std::mutex
f21eebc
[TerrainSimplificationRos::getTraversability] add missing return keyword
a8eff16
[TerrainSimplificationRos] load parameters from a yaml config file
38bffbc
[TerrainSimplificationRos] add doxygen comments
4b6bd58
[TerrainSimplification, TerrainSimplificationRos] use setGridMap() an…
a6c8887
[TerrainSimplification, TerrainSimplificationRos] use shared_ptr to T…
91f2839
[TerrainSimplificationRos] add getTerrainSimplification()
772755f
[TerrainSimplificationRos] fix ROS param name
5a24948
[TerrainSimplificationRos] make getTerrainSimplification() public
0fae537
[TerrainSimplification] add catkin dependencies and link libraries
a4a5f56
[TerrainSimplification::getSimplifiedGridMap] Rearrange and group pro…
7ab7b59
remove lcm based executable
benoit-robotics 61cf5fc
Merge branch 'master' into add-terrain-simplification
benoit-robotics 2fd6ade
[TerrainSimplificationRos::pubSimplifiedMap] fix small x offset in th…
422ca45
[terrain_simplification] add OpenCV to CMakeLists
a5bca91
[TerrainSimplification] create containers (struct) for related images…
0bd4b6f
[TerrainSimplification] compute first- and second-order partial deriv…
ed9d96f
Merge branch 'add-terrain-simplification' of github.com:ori-drs/plane…
7e16a61
[TerrainSimplification] add a base-motion-constraint gif
6e28902
Create README.md
oliwiermelon 95bda33
[TerrainSimplification] add an image of the computed derivatives of t…
2824628
Update README.md
oliwiermelon 4bbd36e
[TerrainSimplification] add another gif and image
000f946
Merge branch 'add-terrain-simplification' of github.com:ori-drs/plane…
0d727e3
Update README.md
oliwiermelon aaef071
[terrain_simplification_ros] add the main config file
8937546
[TerrainSimplification::getValueAtPosition] add cerr
dc67894
[terrain_simplification_ros] uncomment a slope-blurring filter
30b4bee
[TerrainSimplification] check that robot position is inside the map
9aaa83e
[terrain_simplification_ros] change config to use an unscaled 2.5x2.5…
32c088f
[TerrainSimplification::convertCvImagesOfSecondOrderDerivativesToGrid…
317ea82
[TerrainSimplification::simplifyGridMap] remove slope conversion
a12b94c
[TerrainSimplification, TerrainSimplificationRos] account for the poi…
35b4c1b
[terrain_simplification_ros] change trottled topic name
ab200cc
[TerrainSimplification] fix minor bug
0f879e5
[terrain_simplification] clean CMakeLists.txt and package.xml
ab459ba
[terrain_simplification_ros] update README.md
448eb58
[terrain_simplification] Fix virtual destructor
wxmerkt 9471693
[terrain_simplification_ros] Replace loadConfigFile with loading from…
wxmerkt 2541404
[terrain_simplification_ros] Replace "success" in constructor with ex…
wxmerkt b3bd970
[terrain_simplification] Make grid resolution configurable
wxmerkt c8c9b25
[terrain_simplification] Typos & add TODO comments
wxmerkt e18c39d
[terrain_simplification] Minor
wxmerkt 318ee8f
[terrain_simplification_ros] comment out filters in filter_chain for …
608777b
[TerrainSimplification] make filter chain an option
9b6e9b4
[TerrainSimplification::simplifyGridMap] remove default "simplified" …
11a102f
[TerrainSimplification::simplifyGridMap] fix spelling
9156a01
[TerrainSimplification::simplifyGridMap] change arguments of addDataF…
7284ba0
[TerrainSimplification::convertCvImageToGridMap] check and print out …
147218f
[terrain_simplification_ros] load filter_chain within the ros node
b746de5
[TerrainSimplificationRos] improve warnings
2b1deb8
[TerrainSimplification, TerrainSimplificationRos] update deprecated f…
4d642ac
[terrain_simplification, terrain_simplification_ros] use grid_map_fil…
a372902
[TerrainSimplification] comment out derivatives
a599266
[terrain_simplification_ros] add fake tf publisher
df88525
[ts, ts_ros] make filtered layer name settable
25c688c
[terrain_simplification] Ignore warnings from filter_chain
wxmerkt d1f2c28
[terrain_simplification_ros] Remove explicit dependency on grid_map_f…
wxmerkt a3efd44
[terrain_simplification_ros] Update CMake version
wxmerkt File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,80 @@ | ||
cmake_minimum_required(VERSION 2.8.3) | ||
project(terrain_simplification) | ||
|
||
add_compile_options(-std=c++11) | ||
set(DEFAULT_BUILD "Release") | ||
if(NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES) | ||
message(STATUS "Setting build type to '${DEFAULT_BUILD}' as none was specified.") | ||
set(CMAKE_BUILD_TYPE ${DEFAULT_BUILD} CACHE STRING "Choose the type of build." FORCE) | ||
# Set the possible values of build type for cmake-gui | ||
set_property(CACHE CMAKE_BUILD_TYPE PROPERTY STRINGS "Debug" | ||
"Release" | ||
"MinSizeRel" | ||
"RelWithDebInfo") | ||
endif() | ||
|
||
add_definitions(-DMELO_FUNCTION_PRINTS) | ||
|
||
find_package(catkin REQUIRED COMPONENTS | ||
grid_map_core | ||
grid_map_filters | ||
grid_map_cv | ||
) | ||
|
||
find_package(OpenCV REQUIRED) | ||
|
||
################################### | ||
## catkin specific configuration ## | ||
################################### | ||
## The catkin_package macro generates cmake config files for your package | ||
catkin_package( | ||
INCLUDE_DIRS include | ||
LIBRARIES ${PROJECT_NAME} | ||
CATKIN_DEPENDS | ||
grid_map_core | ||
grid_map_filters | ||
grid_map_cv | ||
) | ||
|
||
########### | ||
## Build ## | ||
########### | ||
add_library(${PROJECT_NAME} | ||
src/terrain_simplification.cpp | ||
) | ||
|
||
include_directories( | ||
include | ||
${OpenCV_INCLUDE_DIRS} | ||
${catkin_INCLUDE_DIRS} | ||
) | ||
|
||
add_dependencies(${PROJECT_NAME} | ||
${${PROJECT_NAME}_EXPORTED_TARGETS} | ||
${OpenCV_EXPORTED_TARGETS} | ||
${catkin_EXPORTED_TARGETS}) | ||
|
||
|
||
target_link_libraries(${PROJECT_NAME} | ||
${OpenCV_LIBS} | ||
${catkin_LIBRARIES} | ||
) | ||
|
||
############# | ||
## Install ## | ||
############# | ||
# Mark library for installation | ||
install( | ||
TARGETS | ||
${PROJECT_NAME} | ||
ARCHIVE DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION} | ||
LIBRARY DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION} | ||
RUNTIME DESTINATION ${CATKIN_PACKAGE_BIN_DESTINATION} | ||
) | ||
|
||
# Mark header files for installation | ||
install( | ||
DIRECTORY include/${PROJECT_NAME}/ | ||
DESTINATION ${CATKIN_PACKAGE_INCLUDE_DESTINATION} | ||
FILES_MATCHING PATTERN "*.hpp" | ||
) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,7 @@ | ||
![A gif demonstrating the use of terrain simplification as a base-motion-constraint, shown at 5x speed.](https://github.com/ori-drs/plane_seg/blob/add-terrain-simplification/terrain_simplification/terrain-simplification_base-motion-constraint_5x-speed.gif) | ||
|
||
![A gif demonstrating the use of terrain simplification in simulation.](https://github.com/ori-drs/plane_seg/blob/add-terrain-simplification/terrain_simplification/terrain-simplification_base-motion-constraint_simulation.gif) | ||
|
||
![An image demonstrating the use of terrain simplification to compute first- and second-order partial derivatives of any image.](https://github.com/ori-drs/plane_seg/blob/add-terrain-simplification/terrain_simplification/terrain-simplification_derivatives.png) | ||
|
||
![A traversability map computed using FilterChain.](https://github.com/ori-drs/plane_seg/blob/add-terrain-simplification/terrain_simplification/terrain-simplification_traversability.png) |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
These links will no longer work after this branch has been merged and deleted