Skip to content

Commit 32cb933

Browse files
committed
fix license; update readme
1 parent bdfe94f commit 32cb933

File tree

2 files changed

+30
-27
lines changed

2 files changed

+30
-27
lines changed

LICENSE.TXT

Lines changed: 23 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,28 @@
1-
All components of Drake are licensed under the BSD 3-Clause License
2-
shown below. Where noted in the source code, some portions may
3-
be subject to other permissive, non-viral licenses.
1+
BSD 3-Clause License
42

5-
Copyright 2012-2022 Robot Locomotion Group @ CSAIL
6-
All rights reserved.
3+
Copyright (c) 2023, MIT Robot Locomotion Group
74

85
Redistribution and use in source and binary forms, with or without
9-
modification, are permitted provided that the following conditions are
10-
met:
6+
modification, are permitted provided that the following conditions are met:
117

12-
Redistributions of source code must retain the above copyright notice,
13-
this list of conditions and the following disclaimer. Redistributions
14-
in binary form must reproduce the above copyright notice, this list of
15-
conditions and the following disclaimer in the documentation and/or
16-
other materials provided with the distribution. Neither the name of
17-
the Massachusetts Institute of Technology nor the names of its
18-
contributors may be used to endorse or promote products derived from
19-
this software without specific prior written permission.
8+
1. Redistributions of source code must retain the above copyright notice, this
9+
list of conditions and the following disclaimer.
2010

21-
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
22-
"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
23-
LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
24-
A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
25-
HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
26-
SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
27-
LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
28-
DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
29-
THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
30-
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
31-
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
11+
2. Redistributions in binary form must reproduce the above copyright notice,
12+
this list of conditions and the following disclaimer in the documentation
13+
and/or other materials provided with the distribution.
14+
15+
3. Neither the name of the copyright holder nor the names of its
16+
contributors may be used to endorse or promote products derived from
17+
this software without specific prior written permission.
18+
19+
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
20+
AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
21+
IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
22+
DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
23+
FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
24+
DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
25+
SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
26+
CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
27+
OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
28+
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

README.md

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,10 @@
1-
# GCS - Motion Planning around Obstacles with Convex Optimization
1+
# Motion Planning around Obstacles with Convex Optimization
2+
3+
This repository contains the code to reproduce the examples in the paper [Motion Planning around Obstacles with Convex Optimization](https://arxiv.org/abs/2106.09610) by Tobia Marcucci, Mark Petersen, David von Wrangel, and Russ Tedrake.
4+
5+
To use [Graphs of Convex Sets (GCS) Trajectory Optimization](https://drake.mit.edu/doxygen_cxx/classdrake_1_1planning_1_1trajectory__optimization_1_1_gcs_trajectory_optimization.html) in your own code, we recommend that you use the version in [Drake](http://drake.mit.edu), which is being actively developed and improved.
6+
7+
## Versions
28

39
This code has been updated since the Arxiv paper was published. The code used to run the examples in that paper can be found under the [`arxiv_paper_version`](https://github.com/mpetersen94/gcs/releases/tag/arxiv_paper_version) tag. That version was tested to work with Drake version 1.3 (although version up to 1.8 should work with some deprecation warnings).
410

0 commit comments

Comments
 (0)