Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
380 commits
Select commit Hold shift + click to select a range
55e4de1
Methods naming changed to python conventions
maartenvanhooftds Apr 14, 2019
7271799
Method descriptions added; Made more user-friendly
maartenvanhooftds Apr 14, 2019
24c9de4
Robot reset; remove some compilation warnings
maartenvanhooftds Apr 16, 2019
1b59808
Automated run analysis support on MAC OS X
langongjin Apr 16, 2019
df5d509
Neuron state reset; Robot position reset; Fix a validation bug
maartenvanhooftds Apr 18, 2019
88b274e
Fix syntax error
maartenvanhooftds Apr 18, 2019
8b2eada
Add limbo thirdparty library, fix dependencies in cmake
portaloffreedom Apr 23, 2019
0087fc5
Construct bo_learner directory
maartenvanhooftds Apr 23, 2019
30e4648
small cmake adjustments
portaloffreedom Apr 23, 2019
20ac8a5
Continous file writing; Parameters passed via Python; More parameters…
maartenvanhooftds Apr 23, 2019
5b5efcd
Fix {} if/else/for convention
maartenvanhooftds Apr 23, 2019
fb89307
Changed \n -> std::endl
maartenvanhooftds Apr 23, 2019
4174d6a
First half of comments
maartenvanhooftds Apr 23, 2019
3f49fb3
USE_NLOPT from cmake
portaloffreedom Apr 23, 2019
254cc19
Merge branch 'bayesian-optimization' of github.com:ci-group/revolve i…
portaloffreedom Apr 23, 2019
4d2a104
Fixed the second half of the comments
maartenvanhooftds Apr 23, 2019
10da399
Remove validation part from monotonic plot
maartenvanhooftds Apr 23, 2019
130330f
Fix neuron state reset
maartenvanhooftds Apr 24, 2019
5ff7a4e
Merge remote-tracking branch 'origin/bayesian-optimization' into baye…
maartenvanhooftds Apr 24, 2019
17ed60a
Change robot reset; Prepare evaluator for directed locomotion
maartenvanhooftds Apr 24, 2019
2a99cf8
Grid search for CPG
maartenvanhooftds Apr 25, 2019
b60921d
worldplugin fix and removed print messages from manager
portaloffreedom Apr 25, 2019
7349154
Merge branch 'development' of github.com:ci-group/revolve into develo…
portaloffreedom Apr 25, 2019
d89516a
Update of the plots
maartenvanhooftds Apr 25, 2019
6d25bc5
First parallelization implementation
maartenvanhooftds Apr 25, 2019
2c5496d
don't reconnect every generation
portaloffreedom Apr 25, 2019
6f15c7d
Read parameters from yaml-file
maartenvanhooftds Apr 25, 2019
a6010b8
Support for loading robots by manager argument
maartenvanhooftds Apr 25, 2019
50f929f
Second version of grid search based on experiments queue (not on n_ru…
maartenvanhooftds Apr 26, 2019
49b025d
Support for BO parameters grid search
maartenvanhooftds Apr 26, 2019
21ba54d
Fix port bug
maartenvanhooftds Apr 26, 2019
65454ec
Add verbose
maartenvanhooftds Apr 26, 2019
c8cb7d2
Startup time included
maartenvanhooftds Apr 26, 2019
278d5f9
Fix global variable issue
maartenvanhooftds Apr 27, 2019
47d76f8
Support EI acquifun; Search over acqui functions from yaml
maartenvanhooftds Apr 27, 2019
2a9eb8e
Allow for unsuccesful runs
maartenvanhooftds Apr 28, 2019
f32357e
Fix n_cooldown_iters and n_learning_iters
maartenvanhooftds Apr 28, 2019
49b04de
Remove buggy ORT sampling
maartenvanhooftds Apr 30, 2019
906e479
Fix first init sampling sample issue in a neat way
maartenvanhooftds Apr 30, 2019
7c79b37
Frame of reference
maartenvanhooftds Apr 30, 2019
2ce12c8
Ripper bug fixed
maartenvanhooftds Apr 30, 2019
e5e3f7e
Merge local Maarten vs remote
maartenvanhooftds Apr 30, 2019
c598e44
Adapt to be more user-friendly
maartenvanhooftds Apr 30, 2019
b448952
Include manual for using the GridSearch file
maartenvanhooftds Apr 30, 2019
2421912
Put manual in correct location
maartenvanhooftds Apr 30, 2019
d7745a8
Update readme gridsearch
maartenvanhooftds Apr 30, 2019
391dca8
Frame of reference implemented; Make clear where the user can enter p…
maartenvanhooftds May 2, 2019
beea7f5
Bugfix of renewed signal factors
maartenvanhooftds May 2, 2019
8d13d3d
Simulator output discard yielding a far higher succes rate;
maartenvanhooftds May 2, 2019
c254fd4
Merge changes
langongjin May 2, 2019
ff69e29
No manual specification of <name>.yaml required
maartenvanhooftds May 2, 2019
583508e
The yaml files of all 9 robots are working
langongjin May 3, 2019
8cb5573
Include 3d plotting
maartenvanhooftds May 3, 2019
b1fd266
Manual Run analysis for unfinished parallel runs
maartenvanhooftds May 3, 2019
6d57ac2
Create directories if nonexistent
maartenvanhooftds May 3, 2019
884a997
Fix neuron update bug
maartenvanhooftds May 3, 2019
ecfd0e0
Update various
maartenvanhooftds May 4, 2019
6572431
custom logging implementation
amirbnnsr May 4, 2019
043dc28
Inlcude robot size in yamls
maartenvanhooftds May 5, 2019
895a417
the yaml files of 9 robots
langongjin May 5, 2019
09dbb20
Disable run-analytics for now (always do it manually on ripper)
maartenvanhooftds May 6, 2019
c4d160b
Merge branch 'bayesian-optimization' of https://github.com/ci-group/r…
maartenvanhooftds May 6, 2019
5cd40ed
Include robot size in yaml
maartenvanhooftds May 6, 2019
edd0aeb
missed exception prints and alignment fixes
amirbnnsr May 6, 2019
9a386a3
restarts new simulator after every generation
amirbnnsr May 8, 2019
50754fc
Fixed restarting the world
portaloffreedom May 8, 2019
830172a
structured fitness/measure functions and made configurable
safsaf150 May 9, 2019
36c0453
Merge pull request #53 from safsaf150/fitness
portaloffreedom May 9, 2019
249eb94
Improved DynamicSimulatorSupervisor
portaloffreedom May 9, 2019
f3eb3f3
fixed unit test
amirbnnsr May 9, 2019
b823cb7
Merge remote-tracking branch 'origin/development' into development
amirbnnsr May 9, 2019
08cb99b
Merge pull request #52 from Rimabo/development
portaloffreedom May 9, 2019
ba0bce0
Merge remote-tracking branch 'origin/development' into multi_world
amirbnnsr May 9, 2019
0d8cce2
Fix Dockerfile
portaloffreedom May 9, 2019
6baeb33
added fitness function in multi_world
amirbnnsr May 9, 2019
213a776
Merge remote-tracking branch 'ripper1/multi_world' into multi_world
amirbnnsr May 9, 2019
0ded405
Made simulation start process asynchronous
amirbnnsr May 9, 2019
c38e6a0
fetches points of contact and calculate new fitness function
karinemiras May 9, 2019
eb6c906
Include file for doing the run_analysis "manually"
maartenvanhooftds May 13, 2019
6a9e859
Fix 0 bug
maartenvanhooftds May 13, 2019
4310340
Include minimum number of rows
maartenvanhooftds May 13, 2019
b049f74
Analysis fixes
maartenvanhooftds May 13, 2019
171cb23
Multi world stability update
portaloffreedom May 14, 2019
a2b1dce
Update analysis files
maartenvanhooftds May 15, 2019
fc7beee
Fix delete requests as queue instead of single value
portaloffreedom May 16, 2019
e1230a2
experiment manager part I: files exportation rules
karinemiras May 20, 2019
feb08ee
CPG update; working on Ripper3Gongjin
maartenvanhooftds May 20, 2019
475ba32
One spider. Gitignore update
maartenvanhooftds May 20, 2019
bbdfb08
Merge remote-tracking branch 'origin/bayesian-optimization' into baye…
maartenvanhooftds May 20, 2019
5d47b56
Merge
maartenvanhooftds May 20, 2019
6aa604d
experiment manager part II: recovery part I
karinemiras May 21, 2019
2c375b0
experiment manager part II: recovery part II
karinemiras May 22, 2019
aa029ff
Include run gazebo boolean
maartenvanhooftds May 25, 2019
82bff43
Gongjin: Update fitness function
maartenvanhooftds May 27, 2019
b3bf23a
Add Debug Mode for SimulatorSimpleQueue
portaloffreedom May 27, 2019
4ddf5f0
Fix setting BO parmaeters in a nice way (but perhaps not threadsafe)
maartenvanhooftds May 29, 2019
a6ef330
Gridsearch merge
maartenvanhooftds May 29, 2019
b0fc7bb
Include timeout
maartenvanhooftds May 30, 2019
634c7c8
Fix neural network max size
portaloffreedom Jun 3, 2019
4f9b050
Made simulator queue more reliable
portaloffreedom Jun 3, 2019
9e22f88
correct some errors over previous commit
portaloffreedom Jun 4, 2019
4388431
implemented start_port of the simulator as a function parameter
portaloffreedom Jun 4, 2019
a873041
small changes
karinemiras Jun 4, 2019
a74d3ff
Merge pull request #55 from ci-group/multi_world
karinemiras Jun 4, 2019
0d01c5b
Merge remote-tracking branch 'origin/development' into contacts
karinemiras Jun 4, 2019
475aebc
Merge remote-tracking branch 'origin/development' into contacts
karinemiras Jun 4, 2019
e89a0b9
matteo and karine made several fixes
karinemiras Jun 5, 2019
23cb8d5
more worlds
karinemiras Jun 5, 2019
a50163e
several small improvements + floor is lava function
karinemiras Jun 5, 2019
7567dae
several small improvements + floor is lava function
karinemiras Jun 5, 2019
bc168ec
experiment_management file
karinemiras Jun 5, 2019
8b2f671
new models
karinemiras Jun 5, 2019
c8950f2
Update yamls; bugfix Gridsearch; BOTuningAnalysis
maartenvanhooftds Jun 7, 2019
3695af1
Update font size for BOTuningAnalysis
maartenvanhooftds Jun 10, 2019
acae1dc
Update python scripts
maartenvanhooftds Jun 10, 2019
6267b79
fixes for revolve
portaloffreedom Jun 11, 2019
ae98e66
Merge pull request #54 from ci-group/contacts
karinemiras Jun 11, 2019
6652dea
fixing fitness funtion hill / lava
karinemiras Jun 11, 2019
962457a
fixing idrobot
karinemiras Jun 11, 2019
965951f
many fixes:
karinemiras Jun 11, 2019
a37b882
Fixed remove robot deadlock
portaloffreedom Jun 12, 2019
f70575a
saving fitnesses / loading fitnesses
karinemiras Jun 12, 2019
33d218f
Merge remote-tracking branch 'origin/contacts' into development
portaloffreedom Jun 13, 2019
65ae97c
Merge remote-tracking branch 'origin/bayesian-optimization' into brai…
portaloffreedom Jun 13, 2019
601d83e
Removed pygazebo submodule
portaloffreedom Jun 14, 2019
2e255e0
Restructured CMAKE files
portaloffreedom Jun 14, 2019
53cfc36
initial implementation of evaluation failure attempt counter
amirbnnsr Jun 14, 2019
7e7e1ac
manually merged some differences with ahead branches
amirbnnsr Jun 14, 2019
8d69c2b
temporary render script to render yaml file to 2D images
amirbnnsr Jun 14, 2019
ca15ecb
PEP8 fixes
amirbnnsr Jun 14, 2019
b39ab17
fixed mistake regarding returning fitness
amirbnnsr Jun 14, 2019
6a0926c
Merge branch 'eval_attempt_limit' of github.com:Rimabo/revolve into e…
amirbnnsr Jun 14, 2019
af318bf
Ported independent part of the DifferentialCPG controller
portaloffreedom Jun 14, 2019
b29c2c7
Added Raspberry portion of the code
portaloffreedom Jun 14, 2019
60166e6
Set C++11 as standard
portaloffreedom Jun 14, 2019
25374cd
Lowered CMAKE requirements to accomodate debian
portaloffreedom Jun 14, 2019
4593525
Added PIGPIO library in thirdparty
portaloffreedom Jun 14, 2019
86540b0
Added PIGPIO header folder variable for cmake
portaloffreedom Jun 14, 2019
bdf2d73
Added PIGPIO Servo class
portaloffreedom Jun 14, 2019
4af09a8
Implemented Actuator for raspberry Servo
portaloffreedom Jun 14, 2019
1b077e0
install PIGPIO
portaloffreedom Jun 14, 2019
ae7e2e5
fix minor connection issue
portaloffreedom Jun 14, 2019
fd9849a
Improvement in servo class and Servo loading
portaloffreedom Jun 15, 2019
cf72405
enable PIGPIO testing
portaloffreedom Jun 15, 2019
4e278ee
Added PIGPIO unit file
portaloffreedom Jun 15, 2019
05dce9a
Added address and port to config file
portaloffreedom Jun 15, 2019
3432cdd
add new install targets
portaloffreedom Jun 15, 2019
5ebc46c
failed robot saving problem fix
amirbnnsr Jun 15, 2019
2d1688f
fixed tab spacing and converted concat string to f string
amirbnnsr Jun 15, 2019
17dc613
fix install target for service file
portaloffreedom Jun 15, 2019
90cda03
reset counter to 0 when evaluation is done
amirbnnsr Jun 15, 2019
ce1ba69
fixed raspberry commands
portaloffreedom Jun 15, 2019
d8e5cb1
potential fix
amirbnnsr Jun 16, 2019
c889a38
added Real Time priority to systemd service
portaloffreedom Jun 17, 2019
1a2993f
added Raspberry controller + various fixes
portaloffreedom Jun 17, 2019
4a3212d
ops, what is target_link_directories?
portaloffreedom Jun 17, 2019
df8e313
Added fake learning to raspberry pi
portaloffreedom Jun 17, 2019
5159a99
potential fix for disconnect error
amirbnnsr Jun 18, 2019
ad643ed
removed commented code
amirbnnsr Jun 19, 2019
406951a
save failed robot's sdf
amirbnnsr Jun 19, 2019
0df1a01
Merge pull request #57 from ci-group/brain_separation
portaloffreedom Jun 19, 2019
71c38e8
Merge pull request #56 from Rimabo/eval_attempt_limit
portaloffreedom Jun 19, 2019
7d1748d
multiple fixes
karinemiras Jun 20, 2019
b18d0f2
saving fitnesses / loading fitnesses
karinemiras Jun 20, 2019
b22aa54
export behaviors
karinemiras Jun 20, 2019
c0f19b6
Improvements for unmanaged/open-ended evolution
portaloffreedom Jun 21, 2019
7c52fa1
Update logger.py
portaloffreedom Jun 24, 2019
aa2692b
Update logger.py
portaloffreedom Jun 24, 2019
15aea7a
Added chart plotter for open ended evolution
portaloffreedom Jun 24, 2019
76a28c7
watch robots fix
karinemiras Jun 25, 2019
b8b83bf
recover every single robot evaluated
karinemiras Jun 26, 2019
b672afa
cleaning weird files
karinemiras Jun 26, 2019
aedd86b
fixes measures
karinemiras Jun 27, 2019
b8ad468
script to consolidate measures
karinemiras Jun 27, 2019
888116b
fixes plus watchman
karinemiras Jun 27, 2019
c25e38f
fix watchman
karinemiras Jun 27, 2019
4ad237f
fixes: measures + fitness + consolidation + watchman
karinemiras Jun 28, 2019
ec7bf1e
small fixes
karinemiras Jun 28, 2019
1345dd0
updates on many things
portaloffreedom Jun 28, 2019
6f83d5d
scripts to summarize, plot, and test
karinemiras Jul 1, 2019
7f45f50
small fix in recovery
karinemiras Jul 1, 2019
2301d40
small fix to exportation/load of measures
karinemiras Jul 1, 2019
bfc84f8
fix plot script
karinemiras Jul 2, 2019
693795c
logging details
karinemiras Jul 2, 2019
c51de22
small fix watchman
karinemiras Jul 9, 2019
1b0502a
update to pygazebo 4
portaloffreedom Jul 10, 2019
16a3aac
made unmanaged population as a class
portaloffreedom Jul 10, 2019
87bb462
create_task to ensure_future
portaloffreedom Jul 11, 2019
f616528
pygazebo aysnc update
portaloffreedom Jul 12, 2019
17d7bdb
implemented test_robot functionality and added displacement fitness
portaloffreedom Jul 12, 2019
2162462
killing robots for fun
portaloffreedom Jul 12, 2019
4430903
removed spam files
portaloffreedom Jul 12, 2019
2d744ae
added death sentence mechanism in open ended (unmanaged) evolution
portaloffreedom Jul 16, 2019
e396011
update charts to have a live update switch
portaloffreedom Jul 16, 2019
f17399c
general offline evolution improvement
portaloffreedom Jul 16, 2019
6ab4a4c
disconnect is now async
portaloffreedom Jul 16, 2019
d7863b2
fix of relaunch and error handling in for simulator workers
portaloffreedom Jul 16, 2019
da00a88
cancelled dead tasks and removed tracing prints
portaloffreedom Jul 16, 2019
8aaf5a8
simplified simulator worker timeout
portaloffreedom Jul 16, 2019
5734b87
Create charts can now create pngs
portaloffreedom Jul 17, 2019
745f746
Gauss noise to individual's age
portaloffreedom Jul 17, 2019
4e49bdd
Removed requirements error
portaloffreedom Jul 17, 2019
ebedf53
fix for new gauss age distribution
portaloffreedom Jul 17, 2019
38a7140
Improve WorldController stability
portaloffreedom Jul 18, 2019
325a569
minor fixes in pyrevolve library
portaloffreedom Jul 18, 2019
85d2740
open ended manager update
portaloffreedom Jul 18, 2019
e3a68d4
Enabled parallelism on gazebo
portaloffreedom Jul 19, 2019
94f0f4a
Reinserting body analyzer
portaloffreedom Jul 21, 2019
07c39ed
Many small changes
portaloffreedom Jul 21, 2019
3319549
fix create_charts in unmanaged experiments
portaloffreedom Jul 21, 2019
f03d020
improve data collection for unmanaged experiment
portaloffreedom Jul 22, 2019
2d28580
signal robot as dead if an update is not received
portaloffreedom Jul 22, 2019
748980a
Ability to run with no manager
portaloffreedom Jul 22, 2019
868c0f8
robot self collision is now a parameter
portaloffreedom Jul 22, 2019
8c1418b
create snapshots
portaloffreedom Jul 22, 2019
9f674c3
dead simulator callback and stronger pause signaling
portaloffreedom Jul 23, 2019
bd088cd
fix snapshot problem
karinemiras Jul 24, 2019
87bdcb3
CIRCLECI: git clone submodules
portaloffreedom Jul 24, 2019
8fd69e1
Added missing depencency in dockerfile
portaloffreedom Jul 24, 2019
90ffc66
Docker: missing nlopt dependency
portaloffreedom Jul 24, 2019
88a8867
Docker: update build to use custom gazebo-revolve
portaloffreedom Jul 24, 2019
97ba6bb
workaround contacts
karinemiras Jul 24, 2019
b87c6f9
fix unit tests
portaloffreedom Jul 24, 2019
000dd14
Merge pull request #68 from ci-group/circleci
portaloffreedom Jul 24, 2019
37b3aff
Merge branch 'total_recovery' into development
karinemiras Jul 25, 2019
6ccf346
fix render_brain removing random files
karinemiras Jul 25, 2019
40306a2
Behaviour measurements measured inside population and assert contacts…
karinemiras Jul 25, 2019
07745f7
Merge branch 'unmanaged' into development
karinemiras Jul 25, 2019
7125d11
fix visualize robot
portaloffreedom Aug 5, 2019
1c0d0ef
fix BodyAnalyzer plugin and world files
portaloffreedom Aug 5, 2019
6d93448
reintroduced robot collision analyzer
portaloffreedom Aug 5, 2019
96ddf84
small fixes
karinemiras Aug 5, 2019
540524f
Merge remote-tracking branch 'origin/development' into development
karinemiras Aug 5, 2019
c6a5312
analyzer queue
portaloffreedom Aug 5, 2019
4eb6419
implemented collision check in Population
portaloffreedom Aug 5, 2019
849c85e
run the analyzer as gzserver as a default
portaloffreedom Aug 5, 2019
d1d2020
loads behavioral descriptors
karinemiras Aug 5, 2019
659af24
loads behavioral descriptors
karinemiras Aug 5, 2019
537548e
Fix build and MacOS DYLD_LIBRARY_PATH problem
portaloffreedom Aug 6, 2019
4a7c291
Merge remote-tracking branch 'origin/development' into check-collisions
portaloffreedom Aug 6, 2019
0c81ddd
Merge pull request #69 from ci-group/check-collisions
portaloffreedom Aug 6, 2019
78c6b68
added .txt to genotype file name
portaloffreedom Aug 6, 2019
192f8c7
Merge branch 'development' of github.com:ci-group/revolve into develo…
portaloffreedom Aug 6, 2019
352abdb
fix LD_LIBRARY_PATH discovery for linux
portaloffreedom Aug 6, 2019
f7c8252
fixes in loading and saving individual snapshot data for recovery
portaloffreedom Aug 6, 2019
487d6be
minor fix in open ended manager
portaloffreedom Aug 7, 2019
a87d4b4
cleanup program arguments
portaloffreedom Aug 7, 2019
e3e69af
cleanup program arguments part 2
portaloffreedom Aug 7, 2019
a5427a3
cleanup program arguments part 3
portaloffreedom Aug 7, 2019
6d418db
new folder for saving the experimental data
portaloffreedom Aug 7, 2019
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
92 changes: 84 additions & 8 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,30 +5,106 @@ jobs:
- image: circleci/python:3-stretch-node
steps:
- checkout
- run: git submodule sync
- run: git submodule update --init

- setup_remote_docker:
docker_layer_caching: true

- restore_cache:
keys:
- v1-{{ .Branch }}
- v1-
paths:
- ~/caches/revolve.tar
- run:
name: Load Docker image layer cache
command: |
set +o pipefail
docker load -i ~/caches/revolve.tar | true
- run:
name: "Build Docker image"
command: docker build -t cigroup/revolve:$CIRCLE_BRANCH .
command: docker build --cache-from=app -t cigroup/revolve:${CIRCLE_BRANCH//\//_} .
# - run:
# name: "Build documentation"
# command: |
# DOXY_BUILD=/revolve/docker/make_dosc.sh
# docker run -it cigroup/revolve:${CIRCLE_BRANCH//\//_} ${DOXY_BUILD}
- run:
name: Save Docker image layer cache
command: |
mkdir -p ~/caches
docker save -o ~/caches/revolve.tar cigroup/revolve:${CIRCLE_BRANCH//\//_}
- save_cache:
key: v1-{{ .Branch }}-{{ epoch }}
paths:
- ~/caches/revolve.tar
test:
docker:
- image: circleci/python:3-stretch-node

steps:
- setup_remote_docker:
docker_layer_caching: true

- restore_cache:
keys:
- v1-{{ .Branch }}
paths:
- ~/caches/revolve.tar
- run:
name: Load Docker image layer cache
command: |
set +o pipefail
docker load -i ~/caches/revolve.tar | true
- run:
name: "Run Python tests"
command: |
PY_TESTS=/revolve/docker/test_python.sh
docker run -it cigroup/revolve:$CIRCLE_BRANCH ${PY_TESTS}
docker run -it cigroup/revolve:${CIRCLE_BRANCH//\//_} ${PY_TESTS}

deploy:
docker:
- image: circleci/python:3-stretch-node

steps:
- setup_remote_docker:
docker_layer_caching: true

- restore_cache:
keys:
- v1-{{ .Branch }}
paths:
- ~/caches/revolve.tar

- run:
name: Load Docker image layer cache
command: |
set +o pipefail
docker load -i ~/caches/revolve.tar | true

- run:
name: "Save Docker image"
command: |
set -e
TAG=0.1.$CIRCLE_BUILD_NUM
docker login -u $DOCKER_USER -p $DOCKER_PASS
docker push cigroup/revolve:$CIRCLE_BRANCH
docker push cigroup/revolve:${CIRCLE_BRANCH//\//_}

# - run:
# name: "Build documentation"
# command: |
# DOXY_BUILD=/revolve/docker/make_dosc.sh
# docker run -it cigroup/revolve:$CIRCLE_BRANCH ${DOXY_BUILD}
workflows:
version: 2
build_test_deploy:
jobs:
- build
- test:
requires:
- build
- deploy:
requires:
- build
- test
filters:
branches:
only:
- master
- development
8 changes: 6 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,8 @@ htmlcov/
nosetests.xml
coverage.xml
*,cover
experiments/examples/output/
test.py

# Translations
*.mo
Expand All @@ -67,8 +69,10 @@ target/

# Virtual env
.venv*/
.python-version
Pipfile
Pipfile.lock

# Revolve related
*.sdf
*.urdf
*.yaml
*.urdf
3 changes: 3 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[submodule "thirdparty/limbo"]
path = thirdparty/limbo
url = https://github.com/resibots/limbo.git
15 changes: 0 additions & 15 deletions ACKNOWLEDGMENTS

This file was deleted.

23 changes: 0 additions & 23 deletions AUTHORS

This file was deleted.

4 changes: 4 additions & 0 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,8 @@ cmake_minimum_required(VERSION 2.8.12)

project(revolve)

if (BUILD_RASPBERRY)
add_subdirectory(thirdparty/PIGPIO)
endif()

add_subdirectory(cpprevolve)
120 changes: 0 additions & 120 deletions CONTRIBUTING.md

This file was deleted.

25 changes: 10 additions & 15 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,24 +1,19 @@
FROM ubuntu:bionic
FROM cigroup/gazebo:gazebo10-revolve

# Dependencies
RUN apt-get update
RUN apt-get install -y build-essential \
libboost-all-dev \
RUN apt-get update && apt-get upgrade -y && apt-get install -y \
build-essential \
cmake \
curl \
cppcheck \
doxygen \
git \
gsl-bin libgsl0-dev \
mercurial \
pkg-config \
python \
libgsl0-dev \
python3-pip \
libyaml-cpp-dev \
xsltproc \
libcairo2-dev
RUN apt-get install -y libgazebo9-dev gazebo9
RUN apt-get clean && rm -rf /var/lib/apt/lists/*
libcairo2-dev \
graphviz \
libeigen3-dev \
libnlopt-dev && \
apt-get clean && \
rm -rf /var/lib/apt/lists/*

ADD . /revolve
RUN /revolve/docker/build_revolve.sh
Loading