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.

Sign up for GitHub

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

Jump to bottom

WIP: Learners #99

Draft
wants to merge 12 commits into
base: development
Choose a base branch
from
Draft

WIP: Learners #99

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
a8f0451
1# latest bayesian-optimization branch, 2# bo, ea, boea are running.
langongjin Jun 16, 2019
b79ad21
add galgo to the thirdparty foler
langongjin Jun 16, 2019
5f4a4f3
create new learners branch with 1# latest bayesian-optimization branc…
langongjin Jun 16, 2019
d5dd1e6
add the saving of computing time for each iteration
langongjin Jun 18, 2019
35f9508
add the saving of computing time for each iteration, and changed the …
langongjin Jun 18, 2019
e7e97fc
updated the fitness function of gait learning
langongjin Jun 18, 2019
886dc61
update the fitness function of gait learning
langongjin Jun 22, 2019
b3a74a3
add ea parameters to GridSearch.py
langongjin Jun 28, 2019
06228cc
add ea parameters to GridSearch.py
langongjin Jun 28, 2019
b9c4bed
git pull learner to merger before push 'learners' of https://github.c…
langongjin Jun 28, 2019
2a926c2
add galgo for ea parameters in GridSearch.py
langongjin Jun 28, 2019
330a65c
Problem with building hopefully fixed now
DaanZ Sep 15, 2020
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
16 changes: 14 additions & 2 deletions cpprevolve/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,10 @@ set(LIMBO_DIR ../thirdparty/limbo)
set(LIMBO_DEFINES USE_NLOPT)
include_directories(${LIMBO_DIR}/src)

# Find galgo library for EA
set(GALGO_DIR ../thirdparty/galgo)
include_directories(${GALGO_DIR})

# Find GSL - GNU Scientific Library
find_package(GSL REQUIRED)
include_directories(${GSL_INCLUDE_DIRS})
Expand All @@ -87,16 +91,24 @@ include_directories(${YAML_CPP_INCLUDE_DIR})
# Find Gazebo
# LOCAL_GAZEBO_DIR can be set to a path with a gazebo-config.cmake
if (LOCAL_GAZEBO_DIR)
find_package(gazebo 9 REQUIRED CONFIG
find_package(gazebo 10 REQUIRED CONFIG
PATHS "${LOCAL_GAZEBO_DIR}"
NO_DEFAULT_PATH)
message(WARNING "Using local Gazebo @ ${gazebo_DIR}")
else()
find_package(gazebo 9 REQUIRED)
find_package(gazebo 10 REQUIRED)
endif()
include_directories(${GAZEBO_INCLUDE_DIRS})
link_directories(${GAZEBO_LIBRARY_DIRS})

pkg_check_modules(libavcodec libavcodec)
if (NOT libavcodec_FOUND)
BUILD_WARNING("libavcodec not found")
else()
include_directories(${libavcodec_INCLUDE_DIRS})
link_directories(${libavcodec_LIBRARY_DIRS})
endif ()

# Find Protobuf
# TODO: This part is currently a mess, and it should be handeled better
find_package(Protobuf REQUIRED)
Expand Down
Loading