[ompl] 01/01: Merge branch 'master' into debian-robotics
Leopold Palomo-Avellaneda
lepalom-guest at moszumanska.debian.org
Sat Mar 1 00:36:20 UTC 2014
This is an automated email from the git hooks/post-receive script.
lepalom-guest pushed a commit to branch debian-robotics
in repository ompl.
commit 36245537cdd98c76a3cd31788788dfbd8ee111ef
Merge: 138ba05 b0ddecb
Author: Leopold Palomo <leopold.palomo at upc.edu>
Date: Fri Feb 28 12:35:53 2014 +0100
Merge branch 'master' into debian-robotics
Conflicts:
debian/changelog
debian/control
.gitignore | 1 +
.hg_archival.txt | 5 -
.hgignore | 26 -
.hgtags | 23 -
CMakeLists.txt | 43 +-
CMakeModules/CPackSettings.cmake | 20 +-
CMakeModules/FindGCCXML.cmake | 26 +
CMakeModules/FindMORSE.cmake | 42 ++
CMakeModules/OMPLVersion.cmake | 6 +-
CMakeModules/PythonBindingsUtils.cmake | 18 +-
TODO | 9 -
debian/README.Debian | 6 -
debian/README.source | 7 -
debian/changelog | 43 +-
debian/control | 82 ++-
debian/{libompl7.install => libompl9.install} | 0
debian/patches/series | 1 +
debian/patches/unmacx_header.patch | 8 +
debian/rules | 16 +-
debian/watch | 6 +-
demos/CMakeLists.txt | 13 +-
demos/HypercubeBenchmark.cpp | 120 ++++
demos/KinematicChainBenchmark.cpp | 323 +++++++++
demos/OptimalPlanning.cpp | 4 +-
demos/OptimalPlanning.py | 2 +-
demos/PlannerData.cpp | 37 +-
demos/PlannerData.py | 10 +-
demos/PlannerProgressProperties.cpp | 114 ++++
demos/Point2DPlanning.cpp | 173 +++++
demos/Point2DPlanning.py | 132 ++++
.../{RigidBodyPlanning.py => RandomWalkPlanner.py} | 160 ++---
demos/RigidBodyPlanning.py | 2 +-
demos/RigidBodyPlanningWithControls.py | 2 +-
...RigidBodyPlanningWithIntegrationAndControls.cpp | 2 +-
demos/RigidBodyPlanningWithODESolverAndControls.py | 2 +-
demos/StateSampling.py | 2 +-
demos/morse/rampJumpDemo_complete.blend | Bin 0 -> 10004944 bytes
demos/morse/rampJumpDemo_starter.blend | Bin 0 -> 498144 bytes
doc/CMakeLists.txt | 54 +-
doc/Doxyfile | 3 +-
doc/css/ompl.css | 1 +
doc/header.html | 1 +
doc/images/balanced.gif | Bin 0 -> 2404825 bytes
doc/images/clearance.gif | Bin 0 -> 2327137 bytes
doc/images/path-length.gif | Bin 0 -> 2879674 bytes
doc/markdown/benchmark.md | 117 +++-
doc/markdown/buildOptions.md | 14 +
doc/markdown/demos.md | 4 +
doc/markdown/developers.md | 9 +-
doc/markdown/gallery.md | 15 +
doc/markdown/installation.md | 8 +-
doc/markdown/morse.md | 118 ++++
doc/markdown/optimalPlanning.md | 5 +-
doc/markdown/optimalPlanningTutorial.md | 6 +-
doc/markdown/optimizationObjectivesTutorial.md | 18 +-
doc/markdown/planners.md | 2 +
doc/markdown/releaseNotes.md | 20 +-
doc/markdown/thirdparty.md | 4 +-
doc/markdown/tutorials.md | 1 +
doc/mkwebdocs.sh | 29 -
py-bindings/CMakeLists.txt | 39 +-
py-bindings/PRM.SingleThreadSolve.cpp | 10 +-
py-bindings/generate_bindings.py | 64 +-
py-bindings/headers_base.txt | 3 +-
py-bindings/headers_geometric.txt | 1 +
py-bindings/headers_morse.txt | 10 +
py-bindings/headers_util.txt | 1 +
py-bindings/ompl/app/__init__.py | 16 +
py-bindings/ompl/morse/__init__.py | 3 +
py-bindings/ompl/morse/addons/ompl_addon.py | 731 +++++++++++++++++++++
py-bindings/ompl/morse/builder.py | 189 ++++++
py-bindings/ompl/morse/communicator.py | 516 +++++++++++++++
py-bindings/ompl/morse/environment.py | 405 ++++++++++++
py-bindings/ompl/morse/planner.py | 121 ++++
py-bindings/ompl/morse/player.py | 92 +++
py-bindings/ompl/rrtstar/__init__.py | 2 +
py-bindings/ompl_py_morse.h | 23 +
scripts/CMakeLists.txt | 5 +-
scripts/ompl_benchmark_statistics.py | 35 +-
src/CMakeLists.txt | 8 +-
src/external/downloadPyPlusPlus.cmake | 4 +-
src/external/installPyPlusPlus.bat.in | 2 +-
src/external/installPyPlusPlus.sh.in | 10 +-
src/ompl/CMakeLists.txt | 9 +-
src/ompl/base/Planner.h | 40 +-
src/ompl/base/PlannerData.h | 49 +-
src/ompl/base/PlannerDataGraph.h | 3 +-
src/ompl/base/PlannerDataStorage.h | 6 +-
src/ompl/base/PlannerTerminationCondition.h | 114 +---
src/ompl/base/StateSampler.h | 4 +
src/ompl/base/spaces/RealVectorStateSpace.h | 8 +
src/ompl/base/spaces/SO3StateSpace.h | 5 +-
src/ompl/base/spaces/src/SO3StateSpace.cpp | 30 +-
src/ompl/base/src/Planner.cpp | 14 +-
src/ompl/base/src/PlannerData.cpp | 121 +++-
src/ompl/base/src/PlannerTerminationCondition.cpp | 236 ++++---
src/ompl/config.h.in | 5 +-
src/ompl/control/PlannerDataStorage.h | 6 +-
.../control/src/SimpleDirectedControlSampler.cpp | 2 +-
src/ompl/datastructures/NearestNeighbors.h | 12 +-
src/ompl/datastructures/NearestNeighborsFLANN.h | 5 +-
src/ompl/datastructures/NearestNeighborsGNAT.h | 112 +++-
src/ompl/datastructures/NearestNeighborsLinear.h | 2 +
.../morse/MorseControlSpace.h} | 47 +-
src/ompl/extensions/morse/MorseEnvironment.h | 162 +++++
.../{config.h.in => extensions/morse/MorseGoal.h} | 51 +-
.../morse/MorseProjection.h} | 55 +-
src/ompl/extensions/morse/MorseSimpleSetup.h | 117 ++++
src/ompl/extensions/morse/MorseStatePropagator.h | 89 +++
src/ompl/extensions/morse/MorseStateSpace.h | 137 ++++
.../morse/MorseStateValidityChecker.h} | 40 +-
.../morse/MorseTerminationCondition.h} | 50 +-
.../morse/src/MorseControlSpace.cpp} | 42 +-
.../morse/src/MorseEnvironment.cpp} | 31 +-
.../morse/src/MorseGoal.cpp} | 35 +-
.../morse/src/MorseProjection.cpp} | 56 +-
src/ompl/extensions/morse/src/MorseSimpleSetup.cpp | 169 +++++
.../morse/src/MorseStatePropagator.cpp} | 51 +-
src/ompl/extensions/morse/src/MorseStateSpace.cpp | 170 +++++
.../morse/src/MorseStateValidityChecker.cpp} | 32 +-
.../morse/src/MorseTerminationCondition.cpp} | 13 +-
src/ompl/geometric/planners/prm/PRM.h | 1 +
src/ompl/geometric/planners/prm/SPARS.h | 1 +
src/ompl/geometric/planners/prm/SPARStwo.h | 1 +
src/ompl/geometric/planners/prm/src/PRM.cpp | 19 +-
src/ompl/geometric/planners/prm/src/PRMstar.cpp | 1 +
src/ompl/geometric/planners/prm/src/SPARS.cpp | 9 +-
src/ompl/geometric/planners/prm/src/SPARStwo.cpp | 9 +-
src/ompl/geometric/planners/rrt/LBTRRT.h | 22 +-
src/ompl/geometric/planners/rrt/src/LBTRRT.cpp | 15 +-
src/ompl/geometric/planners/stride/STRIDE.h | 336 ++++++++++
src/ompl/geometric/planners/stride/src/STRIDE.cpp | 244 +++++++
src/ompl/geometric/src/PathSimplifier.cpp | 2 +-
src/ompl/tools/benchmark/src/Benchmark.cpp | 1 +
src/ompl/util/PPM.h | 127 ++++
src/ompl/util/src/PPM.cpp | 97 +++
tests/CMakeLists.txt | 5 +
tests/base/PlannerTest.h | 10 +-
tests/base/planner_data.cpp | 12 +-
tests/base/ptc.cpp | 1 +
tests/control/2dmap/2dmap.cpp | 2 +-
tests/control/planner_data.cpp | 11 +-
tests/extensions/morse/morse_plan.cpp | 158 +++++
tests/geometric/2d/2dcircles_optimize.cpp | 12 -
tests/geometric/2d/2denvs.cpp | 15 +
tests/resources/ppm/floor.ppm | 52 ++
146 files changed, 6565 insertions(+), 933 deletions(-)
diff --cc debian/changelog
index 89a6bb7,dfa721c..a19afad
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,11 -1,12 +1,19 @@@
-ompl (0.14.1-1) UNRELEASED; urgency=low
++ompl (0.14.1-1+drp70+1) wheezy-robotics; urgency=low
+
+ * Added debug version of the library.
+ * New upstream version.
+ * Bump to soname 9.
+
+ -- Leopold Palomo-Avellaneda <leo at alaxarxa.net> Mon, 13 Jan 2014 10:15:46 +0100
+
+ompl (0.13.0+git20130920.01d0ca4-4+drp70+1) wheezy-robotics; urgency=low
+
+ * Rebuild for drp.
+ * Relaxed the boost depends. Adapted to wheezy-robotics.
+
+ -- Leopold Palomo-Avelleneda <leo at alaxarxa.net> Wed, 09 Oct 2013 09:29:18 +0200
+
- ompl (0.13.0+git20130920.01d0ca4-4) unstable; urgency=low
+ ompl (0.13.0+git20130920.01d0ca4-1) unstable; urgency=low
* Add a missing line in the clean part of the rules file.
* Change compat to 9.
diff --cc debian/control
index c6a9754,c96db62..11b4b4a
--- a/debian/control
+++ b/debian/control
@@@ -1,29 -1,32 +1,32 @@@
Source: ompl
- Priority: extra
- Maintainer: Debian Science Maintainers <debian-science-maintainers at list.debian.org>
- Uploaders: Leopold Palomo-Avelleneda <leo at alaxarxa.net>
+ Maintainer: Debian Science Maintainers <debian-science-maintainers at lists.alioth.debian.org>
+ Uploaders: Leopold Palomo-Avellaneda <leo at alaxarxa.net>
+ Section: libs
+ Priority: optional
Build-Depends: debhelper (>= 9),
- cmake, curl,
- libboost-date-time-dev,
- libboost-thread-dev,
- libboost-serialization-dev,
- libboost-filesystem-dev,
- libboost-system-dev,
- libboost-program-options-dev,
- libboost-test-dev,
- libflann-dev (>= 1.8.3)
+ cmake,
+ curl,
- libboost-date-time-dev (>= 1.50.0),
- libboost-thread-dev (>= 1.50.0),
- libboost-serialization-dev (>= 1.50.0),
- libboost-filesystem-dev (>= 1.50.0),
- libboost-system-dev (>= 1.50.0),
- libboost-program-options-dev (>= 1.50.0),
- libboost-test-dev (>= 1.50.0),
- libflann-dev (>= 1.8.3)
++ libboost-date-time-dev,
++ libboost-thread-dev,
++ libboost-serialization-dev,
++ libboost-filesystem-dev,
++ libboost-system-dev,
++ libboost-program-options-dev,
++ libboost-test-dev,
++ libflann-dev
Standards-Version: 3.9.4
- Section: libs
+ Vcs-Browser: http://anonscm.debian.org/gitweb/?p=debian-science/packages/ompl.git
+ Vcs-Git: git://anonscm.debian.org/debian-science/packages/ompl.git
Homepage: http://ompl.kavrakilab.org
- Vcs-Git: git://git.debian.org/git/debian-science/packages/ompl.git
- Vcs-Browser: http://git.debian.org/?p=debian-science/packages/packages/ompl.git
Package: libompl-dev
- Section: libdevel
Architecture: any
- Pre-Depends: dpkg (>= 1.15.6~)
- Depends: libompl7 (= ${binary:Version}), pkg-config,
- ${shlibs:Depends}, ${misc:Depends}, libboost-dev
+ Section: libdevel
+ Depends: libompl9 (= ${binary:Version}),
+ pkg-config,
+ ${shlibs:Depends},
+ ${misc:Depends},
+ libboost-dev
Description: OMPL library development files
Consists of a set of sampling-based motion planning
algorithms. The content of the library is limited to these algorithms,
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/ompl.git
More information about the debian-science-commits
mailing list