Skip to content
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
wants to merge 64 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
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
Jan 17, 2021
c93e508
Create README.md
oliwiermelon Jan 17, 2021
b4c9391
Check that the queried position is inside the map
Jan 21, 2021
c7a61f4
Add ros server to get a value from a map at a position, create a srv
Jan 21, 2021
e676deb
Merge branch 'add-terrain-simplification' of github.com:ori-drs/plane…
Jan 21, 2021
55810e6
[TerrainSimplification] change from boost::shared_mutex to std::mutex
Jan 26, 2021
f21eebc
[TerrainSimplificationRos::getTraversability] add missing return keyword
Jan 26, 2021
a8eff16
[TerrainSimplificationRos] load parameters from a yaml config file
Jan 26, 2021
38bffbc
[TerrainSimplificationRos] add doxygen comments
Jan 26, 2021
4b6bd58
[TerrainSimplification, TerrainSimplificationRos] use setGridMap() an…
Jan 26, 2021
a6c8887
[TerrainSimplification, TerrainSimplificationRos] use shared_ptr to T…
Jan 27, 2021
91f2839
[TerrainSimplificationRos] add getTerrainSimplification()
Jan 27, 2021
772755f
[TerrainSimplificationRos] fix ROS param name
Jan 28, 2021
5a24948
[TerrainSimplificationRos] make getTerrainSimplification() public
Jan 28, 2021
0fae537
[TerrainSimplification] add catkin dependencies and link libraries
Jan 28, 2021
a4a5f56
[TerrainSimplification::getSimplifiedGridMap] Rearrange and group pro…
Jan 29, 2021
7ab7b59
remove lcm based executable
benoit-robotics Feb 3, 2021
61cf5fc
Merge branch 'master' into add-terrain-simplification
benoit-robotics Feb 3, 2021
2fd6ade
[TerrainSimplificationRos::pubSimplifiedMap] fix small x offset in th…
Feb 5, 2021
422ca45
[terrain_simplification] add OpenCV to CMakeLists
Feb 5, 2021
a5bca91
[TerrainSimplification] create containers (struct) for related images…
Feb 5, 2021
0bd4b6f
[TerrainSimplification] compute first- and second-order partial deriv…
Feb 5, 2021
ed9d96f
Merge branch 'add-terrain-simplification' of github.com:ori-drs/plane…
Feb 5, 2021
7e16a61
[TerrainSimplification] add a base-motion-constraint gif
Feb 5, 2021
6e28902
Create README.md
oliwiermelon Feb 5, 2021
95bda33
[TerrainSimplification] add an image of the computed derivatives of t…
Feb 5, 2021
2824628
Update README.md
oliwiermelon Feb 5, 2021
4bbd36e
[TerrainSimplification] add another gif and image
Feb 5, 2021
000f946
Merge branch 'add-terrain-simplification' of github.com:ori-drs/plane…
Feb 5, 2021
0d727e3
Update README.md
oliwiermelon Feb 5, 2021
aaef071
[terrain_simplification_ros] add the main config file
Feb 7, 2021
8937546
[TerrainSimplification::getValueAtPosition] add cerr
Feb 7, 2021
dc67894
[terrain_simplification_ros] uncomment a slope-blurring filter
Feb 7, 2021
30b4bee
[TerrainSimplification] check that robot position is inside the map
Feb 7, 2021
9aaa83e
[terrain_simplification_ros] change config to use an unscaled 2.5x2.5…
Feb 7, 2021
32c088f
[TerrainSimplification::convertCvImagesOfSecondOrderDerivativesToGrid…
Feb 7, 2021
317ea82
[TerrainSimplification::simplifyGridMap] remove slope conversion
Feb 7, 2021
a12b94c
[TerrainSimplification, TerrainSimplificationRos] account for the poi…
Feb 9, 2021
35b4c1b
[terrain_simplification_ros] change trottled topic name
Feb 9, 2021
ab200cc
[TerrainSimplification] fix minor bug
Feb 10, 2021
0f879e5
[terrain_simplification] clean CMakeLists.txt and package.xml
Feb 10, 2021
ab459ba
[terrain_simplification_ros] update README.md
Feb 10, 2021
448eb58
[terrain_simplification] Fix virtual destructor
wxmerkt Feb 24, 2021
9471693
[terrain_simplification_ros] Replace loadConfigFile with loading from…
wxmerkt Feb 24, 2021
2541404
[terrain_simplification_ros] Replace "success" in constructor with ex…
wxmerkt Feb 24, 2021
b3bd970
[terrain_simplification] Make grid resolution configurable
wxmerkt Feb 24, 2021
c8c9b25
[terrain_simplification] Typos & add TODO comments
wxmerkt Feb 24, 2021
e18c39d
[terrain_simplification] Minor
wxmerkt Feb 24, 2021
318ee8f
[terrain_simplification_ros] comment out filters in filter_chain for …
Mar 1, 2021
608777b
[TerrainSimplification] make filter chain an option
Mar 13, 2021
9b6e9b4
[TerrainSimplification::simplifyGridMap] remove default "simplified" …
Mar 13, 2021
11a102f
[TerrainSimplification::simplifyGridMap] fix spelling
Mar 13, 2021
9156a01
[TerrainSimplification::simplifyGridMap] change arguments of addDataF…
Mar 13, 2021
7284ba0
[TerrainSimplification::convertCvImageToGridMap] check and print out …
Mar 13, 2021
147218f
[terrain_simplification_ros] load filter_chain within the ros node
Jul 5, 2021
b746de5
[TerrainSimplificationRos] improve warnings
Jul 5, 2021
2b1deb8
[TerrainSimplification, TerrainSimplificationRos] update deprecated f…
Jul 5, 2021
4d642ac
[terrain_simplification, terrain_simplification_ros] use grid_map_fil…
Jul 5, 2021
a372902
[TerrainSimplification] comment out derivatives
Jul 5, 2021
a599266
[terrain_simplification_ros] add fake tf publisher
Jul 5, 2021
df88525
[ts, ts_ros] make filtered layer name settable
Jul 26, 2021
25c688c
[terrain_simplification] Ignore warnings from filter_chain
wxmerkt Jul 27, 2021
d1f2c28
[terrain_simplification_ros] Remove explicit dependency on grid_map_f…
wxmerkt Aug 4, 2021
a3efd44
[terrain_simplification_ros] Update CMake version
wxmerkt Aug 4, 2021
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions plane_seg/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -40,9 +40,9 @@ target_link_libraries(plane_seg ${catkin_LIBRARIES})


# standalone lcm-based block fitter
set(APP_NAME block_fitter)
add_executable(${APP_NAME} src/block-fitter.cpp)
target_link_libraries(${APP_NAME} boost_system ${catkin_LIBRARIES})
#set(APP_NAME block_fitter)
#add_executable(${APP_NAME} src/block-fitter.cpp)
#target_link_libraries(${APP_NAME} boost_system ${catkin_LIBRARIES})


# test program
Expand All @@ -65,3 +65,4 @@ install(TARGETS plane_seg

# Mark header files for installation
install(DIRECTORY include/${PROJECT_NAME}/ DESTINATION ${CATKIN_PACKAGE_INCLUDE_DESTINATION})

80 changes: 80 additions & 0 deletions terrain_simplification/CMakeLists.txt
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"
)
7 changes: 7 additions & 0 deletions terrain_simplification/README.md
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)
Copy link
Member

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


![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)
Loading