Skip to content

Commit a13385d

Browse files
authored
Merge pull request #45 from ethz-asl/feature/versioning
Feature/versioning
2 parents b29bd51 + 77f1c10 commit a13385d

File tree

4 files changed

+18
-16
lines changed

4 files changed

+18
-16
lines changed

README.md

+12-10
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,19 @@ Field and Service Robotics. Springer, Cham, 2019.
1717
Install [ROS melodic](http://wiki.ros.org/melodic/Installation/Ubuntu).
1818
Install [mono](https://www.mono-project.com/download/stable/#download-lin-ubuntu).
1919

20+
Install all [remaining dependencies](https://github.com/ethz-asl/polygon_coverage_planning/blob/master/install/prepare-jenkins-slave.sh):
21+
```
22+
cd ~/catkin_ws/polygon_coverage_planning/install
23+
./prepare-jenkins-slave.sh
24+
```
25+
2026
Create a workspace.
2127
```
2228
cd ~
2329
mkdir -p catkin_ws/src
2430
cd catkin_ws
2531
catkin init
32+
catkin config --cmake-args -DCMAKE_BUILD_TYPE=Release
2633
catkin config --extend /opt/ros/melodic
2734
```
2835

@@ -32,17 +39,12 @@ Download package dependencies from [dependencies.rosinstall](install/dependencie
3239
cd ~/catkin_ws/src
3340
git clone git@github.com:ethz-asl/polygon_coverage_planning.git
3441
wstool init
42+
wstool set --git polygon_coverage_planning git@github.com:ethz-asl/polygon_coverage_planning.git -v v1.0.0
43+
wstool update
3544
wstool merge polygon_coverage_planning/install/dependencies.rosinstall
3645
wstool update
3746
```
3847

39-
40-
Install all [remaining dependencies](https://github.com/ethz-asl/polygon_coverage_planning/blob/master/install/prepare-jenkins-slave.sh):
41-
```
42-
cd ~/catkin_ws/polygon_coverage_planning/install
43-
./prepare-jenkins-slave.sh
44-
```
45-
4648
Finally, build the workspace.
4749
```
4850
catkin build
@@ -79,7 +81,7 @@ Setting the polygon and planning the path is the same as for Coverage Planning.
7981
## Licensing
8082
This repository is subject to GNU General Public License version 3 or later due to its dependencies.
8183

82-
# CGAL dependencies
84+
### CGAL dependencies
8385
The underlying (exact) geometric operations rely on [CGAL 5.0.3](https://www.cgal.org/license.html) which is restricted by GNU General Public License version 3 or later.
8486
In particular the dependencies are:
8587
- Algebraic Foundations (LGPL)
@@ -91,8 +93,8 @@ In particular the dependencies are:
9193
- 2D Regularized Boolean Set-Operations (GPL)
9294
- 2D Straight Skeleton and Polygon Offsetting (GPL)
9395

94-
# GTSP solver
95-
The underlying optimization uses the [memetic solver](https://csee.essex.ac.uk/staff/dkarap/?page=publications&key=Gutin2009a) presented in
96+
### GTSP solver
97+
The underlying optimization uses the [memetic solver](http://www.cs.nott.ac.uk/~pszdk/?page=publications&key=Gutin2009a) presented in
9698
```
9799
Gutin, Gregory, and Daniel Karapetyan.
98100
"A memetic algorithm for the generalized traveling salesman problem."

install/dependencies.rosinstall

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
- git: {local-name: catkin_simple, uri: 'git@github.com:catkin/catkin_simple.git'}
1+
- git: {local-name: catkin_simple, uri: 'git@github.com:catkin/catkin_simple.git', version: 0e62848b12da76c8cc58a1add42b4f894d1ac21e}
22
- git: {local-name: cgal_catkin, uri: 'git@github.com:ethz-asl/cgal_catkin.git', version: releases/CGAL-5.0.3}
3-
- git: {local-name: polygon_coverage_planning, uri: 'git@github.com:ethz-asl/polygon_coverage_planning.git'}
3+
- git: {local-name: polygon_coverage_planning, uri: 'git@github.com:ethz-asl/polygon_coverage_planning.git', version: v1.0.0}

install/dependencies_https.rosinstall

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
- git: {local-name: catkin_simple, uri: 'https://github.com/catkin/catkin_simple.git'}
1+
- git: {local-name: catkin_simple, uri: 'https://github.com/catkin/catkin_simple.git', version: 0e62848b12da76c8cc58a1add42b4f894d1ac21e}
22
- git: {local-name: cgal_catkin, uri: 'https://github.com/ethz-asl/cgal_catkin.git', version: releases/CGAL-5.0.3}
3-
- git: {local-name: polygon_coverage_planning, uri: 'https://github.com/ethz-asl/polygon_coverage_planning.git'}
3+
- git: {local-name: polygon_coverage_planning, uri: 'https://github.com/ethz-asl/polygon_coverage_planning.git', version: v1.0.0}

polygon_coverage_solvers/CMakeLists.txt

+2-2
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ set(GKMA_INCLUDE_DIR ${CMAKE_BINARY_DIR}/gk_ma-prefix/src/gk_ma)
1818
include(ExternalProject)
1919
ExternalProject_Add(
2020
gk_ma
21-
URL https://csee.essex.ac.uk/staff/dkarap/gtsp_ma_source_codes.zip
21+
URL http://www.cs.nott.ac.uk/~pszdk/gtsp_ma_source_codes.zip
2222
URL https://polybox.ethz.ch/index.php/s/H4NXeaNPWo6VBrf/download
2323
DOWNLOAD_NAME gtsp_ma_source_codes.zip
2424
URL_MD5 765fad8e3746fa3dd9b81be0afb34d35
@@ -57,7 +57,7 @@ ExternalProject_Add(
5757
include(ExternalProject)
5858
ExternalProject_Add(
5959
gtsp_instances
60-
URL https://csee.essex.ac.uk/staff/dkarap/gtsplib/InstancesBinary.zip
60+
URL http://www.cs.nott.ac.uk/~dxk/gtsplib/InstancesBinary.zip
6161
URL https://polybox.ethz.ch/index.php/s/51iqurpOOQ5cVaJ/download
6262
DOWNLOAD_NAME InstancesBinary.zip
6363
URL_MD5 255831bd47de71df8419a54741f0a6be

0 commit comments

Comments
 (0)