Skip to content

Commit 863be3f

Browse files
committed
Merge branch 'master' into feature/mav_planning_msgs_removal
2 parents 4e82898 + 175d363 commit 863be3f

File tree

2 files changed

+9
-5
lines changed

2 files changed

+9
-5
lines changed

README.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@ Download package dependencies from [dependencies.rosinstall](install/dependencie
3737
**Note**: If you have not setup [SSH keys in GitHub](https://help.github.com/en/enterprise/2.16/user/articles/generating-a-new-ssh-key-and-adding-it-to-the-ssh-agent) use [dependencies_https.rosinstall](install/dependencies_https.rosinstall).
3838
```
3939
cd ~/catkin_ws/src
40-
git clone git@github.com:ethz-asl/polygon_coverage_planning.git
4140
wstool init
4241
wstool set --git polygon_coverage_planning git@github.com:ethz-asl/polygon_coverage_planning.git -v v2.0.0
4342
wstool update
@@ -92,6 +91,9 @@ In particular the dependencies are:
9291
- 2D Triangulation (GPL)
9392
- 2D Regularized Boolean Set-Operations (GPL)
9493
- 2D Straight Skeleton and Polygon Offsetting (GPL)
94+
- 2D Arrangement (GPL), see also
95+
96+
```Fogel, Efi, Dan Halperin, and Ron Wein. CGAL arrangements and their applications: A step-by-step guide. Vol. 7. Springer Science & Business Media, 2012.```
9597

9698
### GTSP solver
9799
The underlying optimization uses the [memetic solver](http://www.cs.nott.ac.uk/~pszdk/?page=publications&key=Gutin2009a) presented in

install/prepare-jenkins-slave.sh

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,14 @@ ROS_VERSION=`rosversion -d`
44
echo "ROS version: ${ROS_VERSION}"
55

66
# Build dependencies.
7-
sudo apt-get install -y python-wstool python-catkin-tools
7+
sudo apt install -y python-wstool python-catkin-tools
88

99
# Package dependencies.
1010
echo "Installing MAV_COMM dependencies."
11-
sudo apt-get install -y ros-${ROS_VERSION}-mav-msgs
11+
sudo apt install -y ros-${ROS_VERSION}-mav-msgs
1212
echo "Installing CGAL dependencies."
13-
sudo apt-get install -y libgmp-dev libmpfr-dev
13+
sudo apt install -y libgmp-dev libmpfr-dev
1414
echo "Installing MONO dependencies."
15-
sudo apt-get install -y mono-devel
15+
sudo apt install -y mono-devel
16+
echo "Installig GLOG dependencices."
17+
sudo apt install -y libgoogle-glog

0 commit comments

Comments
 (0)