Skip to content

Commit

Permalink
Merge pull request #45 from ethz-asl/feature/versioning
Browse files Browse the repository at this point in the history
Feature/versioning
  • Loading branch information
rikba authored Jan 11, 2021
2 parents b29bd51 + 77f1c10 commit a13385d
Show file tree
Hide file tree
Showing 4 changed files with 18 additions and 16 deletions.
22 changes: 12 additions & 10 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,19 @@ Field and Service Robotics. Springer, Cham, 2019.
Install [ROS melodic](http://wiki.ros.org/melodic/Installation/Ubuntu).
Install [mono](https://www.mono-project.com/download/stable/#download-lin-ubuntu).

Install all [remaining dependencies](https://github.com/ethz-asl/polygon_coverage_planning/blob/master/install/prepare-jenkins-slave.sh):
```
cd ~/catkin_ws/polygon_coverage_planning/install
./prepare-jenkins-slave.sh
```

Create a workspace.
```
cd ~
mkdir -p catkin_ws/src
cd catkin_ws
catkin init
catkin config --cmake-args -DCMAKE_BUILD_TYPE=Release
catkin config --extend /opt/ros/melodic
```

Expand All @@ -32,17 +39,12 @@ Download package dependencies from [dependencies.rosinstall](install/dependencie
cd ~/catkin_ws/src
git clone [email protected]:ethz-asl/polygon_coverage_planning.git
wstool init
wstool set --git polygon_coverage_planning [email protected]:ethz-asl/polygon_coverage_planning.git -v v1.0.0
wstool update
wstool merge polygon_coverage_planning/install/dependencies.rosinstall
wstool update
```


Install all [remaining dependencies](https://github.com/ethz-asl/polygon_coverage_planning/blob/master/install/prepare-jenkins-slave.sh):
```
cd ~/catkin_ws/polygon_coverage_planning/install
./prepare-jenkins-slave.sh
```

Finally, build the workspace.
```
catkin build
Expand Down Expand Up @@ -79,7 +81,7 @@ Setting the polygon and planning the path is the same as for Coverage Planning.
## Licensing
This repository is subject to GNU General Public License version 3 or later due to its dependencies.

# CGAL dependencies
### CGAL dependencies
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.
In particular the dependencies are:
- Algebraic Foundations (LGPL)
Expand All @@ -91,8 +93,8 @@ In particular the dependencies are:
- 2D Regularized Boolean Set-Operations (GPL)
- 2D Straight Skeleton and Polygon Offsetting (GPL)

# GTSP solver
The underlying optimization uses the [memetic solver](https://csee.essex.ac.uk/staff/dkarap/?page=publications&key=Gutin2009a) presented in
### GTSP solver
The underlying optimization uses the [memetic solver](http://www.cs.nott.ac.uk/~pszdk/?page=publications&key=Gutin2009a) presented in
```
Gutin, Gregory, and Daniel Karapetyan.
"A memetic algorithm for the generalized traveling salesman problem."
Expand Down
4 changes: 2 additions & 2 deletions install/dependencies.rosinstall
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
- git: {local-name: catkin_simple, uri: '[email protected]:catkin/catkin_simple.git'}
- git: {local-name: catkin_simple, uri: '[email protected]:catkin/catkin_simple.git', version: 0e62848b12da76c8cc58a1add42b4f894d1ac21e}
- git: {local-name: cgal_catkin, uri: '[email protected]:ethz-asl/cgal_catkin.git', version: releases/CGAL-5.0.3}
- git: {local-name: polygon_coverage_planning, uri: '[email protected]:ethz-asl/polygon_coverage_planning.git'}
- git: {local-name: polygon_coverage_planning, uri: '[email protected]:ethz-asl/polygon_coverage_planning.git', version: v1.0.0}
4 changes: 2 additions & 2 deletions install/dependencies_https.rosinstall
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
- git: {local-name: catkin_simple, uri: 'https://github.com/catkin/catkin_simple.git'}
- git: {local-name: catkin_simple, uri: 'https://github.com/catkin/catkin_simple.git', version: 0e62848b12da76c8cc58a1add42b4f894d1ac21e}
- git: {local-name: cgal_catkin, uri: 'https://github.com/ethz-asl/cgal_catkin.git', version: releases/CGAL-5.0.3}
- git: {local-name: polygon_coverage_planning, uri: 'https://github.com/ethz-asl/polygon_coverage_planning.git'}
- git: {local-name: polygon_coverage_planning, uri: 'https://github.com/ethz-asl/polygon_coverage_planning.git', version: v1.0.0}
4 changes: 2 additions & 2 deletions polygon_coverage_solvers/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ set(GKMA_INCLUDE_DIR ${CMAKE_BINARY_DIR}/gk_ma-prefix/src/gk_ma)
include(ExternalProject)
ExternalProject_Add(
gk_ma
URL https://csee.essex.ac.uk/staff/dkarap/gtsp_ma_source_codes.zip
URL http://www.cs.nott.ac.uk/~pszdk/gtsp_ma_source_codes.zip
URL https://polybox.ethz.ch/index.php/s/H4NXeaNPWo6VBrf/download
DOWNLOAD_NAME gtsp_ma_source_codes.zip
URL_MD5 765fad8e3746fa3dd9b81be0afb34d35
Expand Down Expand Up @@ -57,7 +57,7 @@ ExternalProject_Add(
include(ExternalProject)
ExternalProject_Add(
gtsp_instances
URL https://csee.essex.ac.uk/staff/dkarap/gtsplib/InstancesBinary.zip
URL http://www.cs.nott.ac.uk/~dxk/gtsplib/InstancesBinary.zip
URL https://polybox.ethz.ch/index.php/s/51iqurpOOQ5cVaJ/download
DOWNLOAD_NAME InstancesBinary.zip
URL_MD5 255831bd47de71df8419a54741f0a6be
Expand Down

0 comments on commit a13385d

Please sign in to comment.