Merge branch 'develop'

# Conflicts:
#	doc/Matlab_interface.md
#	docs/Matlab_manual.html
#	docs/api/class_g2lib_1_1_clothoid_list.html
#	docs/index.html
#	docs/searchindex.js
#	src/Clothoids/ClothoidList.hxx

.gitignore

@@ -22,3 +22,15 @@ Mugello.txt
 docs_build/sphinx/_build
 docs_build/sphinx/api
 docs_build/xml
+docs_build/sphinx_cpp/_build
+docs_build/sphinx_cpp/api-cpp
+docs_build/sphinx_matlab/_build
+docs_build/sphinx_matlab/api-matlab
+docs_build/xml-c
+docs_build/xml-cpp
+docs_build/xml-matlab
+docs_build/sphinx/_doxygen
+docs_build/sphinx/api-cpp
+docs_build/sphinx/api-matlab
+docs_build/sphinx_matlab/_doxygen
+docs_build/sphinx_matlab/api-cpp

Clothoids.prj

@@ -1,13 +1,13 @@
 <deployment-project plugin="plugin.toolbox" plugin-version="1.0">
-  <configuration build-checksum="2982163833" file="/Users/enrico/Ricerca/develop/C++/pins-mechatronix/LibSources/submodules/Clothoids/Clothoids.prj" location="/Users/enrico/Ricerca/develop/C++/pins-mechatronix/LibSources/submodules/Clothoids" name="Clothoids" target="target.toolbox" target-name="Package Toolbox">
+  <configuration build-checksum="4249423119" file="/Users/enrico/Ricerca/develop/C++/pins-mechatronix/LibSources/submodules/Clothoids/Clothoids.prj" location="/Users/enrico/Ricerca/develop/C++/pins-mechatronix/LibSources/submodules/Clothoids" name="Clothoids" target="target.toolbox" target-name="Package Toolbox">
     <param.appname>Clothoids</param.appname>
     <param.authnamewatermark>Enrico Bertolazzi</param.authnamewatermark>
     <param.email>enrico.bertolazzi@unitn.it</param.email>
     <param.company>Unversità degli Studi di Trento</param.company>
     <param.summary>Clothoids, a library for clothoids computation and more</param.summary>
     <param.description>A library for clothoids computation and more.</param.description>
     <param.screenshot>${PROJECT_ROOT}/toolbox/logo.png</param.screenshot>
-    <param.version>2.0.5</param.version>
+    <param.version>2.0.6</param.version>
     <param.output>${PROJECT_ROOT}/Clothoids.mltbx</param.output>
     <param.products.name />
     <param.products.id />
@@ -111,6 +111,7 @@ setup.m
       <file>${PROJECT_ROOT}/toolbox/src</file>
       <file>${PROJECT_ROOT}/toolbox/src_mex</file>
       <file>${PROJECT_ROOT}/toolbox/tests</file>
+      <file>${PROJECT_ROOT}/toolbox/tests_mlx</file>
     </fileset.rootfiles>
     <fileset.depfun.included />
     <fileset.depfun.excluded />

README.rst

@@ -0,0 +1,104 @@
+Clothoids
+=========
+
+|Build Status| |View ebertolazzi/Clothoids on File Exchange|
+
+G1 and G2 fitting with clothoids, spline of clothoids, circle arc and
+biarc
+
+*by Enrico Bertolazzi (enrico.bertolazzi@unitn.it) and Marco Frego (marco.frego@unibz.it)*
+
+for the documentation see `online documentation <http://ebertolazzi.github.io/Clothoids/>`__
+
+Installation
+------------
+
+Download the library
+
+.. code:: sh
+
+   git clone git@github.com:ebertolazzi/Clothoids.git —recurse-submodules
+
+if you forget ``—recurse-submodules`` you must load the submdule
+quarticRootsFlocke next. To compile the library you can use ``make``
+
+.. code:: sh
+
+   make
+
+or ``cmake``
+
+.. code:: sh
+
+   mkdir build
+   cd build
+   cmake ..
+   make
+
+of ``rake``
+
+.. code:: sh
+
+   rake build_osx   # on mac
+   rake build_linux # on linux
+   rake build_win   # on windows
+
+using ``make`` you have the library and headers in the following tree
+
+.. code:: text
+
+   `-- lib
+       |-- include
+       |   |-- AABBtree.hh
+       |   |-- Biarc.hh
+       |   |-- BiarcList.hh
+       |   |-- Circle.hh
+       |   |-- Clothoid.hh
+       |   |-- ClothoidAsyPlot.hh
+       |   |-- ClothoidList.hh
+       |   |-- Fresnel.hh
+       |   |-- G2lib.hh
+       |   |-- Line.hh
+       |   |-- PolyLine.hh
+       |   |-- PolynomialRoots-Utils.hh
+       |   |-- PolynomialRoots.hh
+       |   `-- Triangle2D.hh
+       `-- lib
+           |-- libClothoids_OSTYPE.dylib
+           `-- libClothoids_OSTYPE_static.a
+
+where OSTYPE can be ``linux``, ``osx``, ``mingw_x64``, ``win_x64``
+
+References
+----------
+
+1. | *E. Bertolazzi, M. Frego*, **G1 fitting with clothoids**,
+   | Mathematical Methods in the Applied Sciences,
+   | John Wiley & Sons, 2014, vol. 38, n.5, pp. 881-897,
+   | `https://doi.org/10.1002/mma.3114 <https://doi.org/10.1002/mma.3114>`__
+
+2. | *E. Bertolazzi, M. Frego*, **On the G2 Hermite interpolation
+     problem with clothoids**,
+   | Journal of Computational and Applied Mathematics,
+   | 2018, vol. 15, n.341, pp. 99-116.
+   | `https://doi.org/10.1016/j.cam.2018.03.029 <https://doi.org/10.1016/j.cam.2018.03.029>`__
+
+3. | *E. Bertolazzi, M. Frego*, **Interpolating clothoid splines with
+     curvature continuity**,
+   | Mathematical Methods in the Applied Sciences,
+   | 2018, vol. 41, n.4, pp. 1099-1476.
+   | `https://doi.org/10.1002/mma.4700 <https://doi.org/10.1002/mma.4700>`__
+
+4. | *E. Bertolazzi, M. Frego* **Point-Clothoid Distance and Projection Computation**,
+   | SIAM Journal on Scientific Computing,
+   | 2019, 41(5), A3326–A3353.
+   | `https://doi.org/10.1137/18M1200439 <https://doi.org/10.1137/18M1200439>`__
+
+5. | *E. Bertolazzi, M. Frego* **A Note on Robust Biarc Computation**,
+   | Computer-Aided Design & Applications 16 (5), 822-835
+   | `http://www.cad-journal.net/files/vol_16/CAD_16(5)_2019_822-835.pdf <http://www.cad-journal.net/files/vol_16/CAD_16(5)_2019_822-835.pdf>`__
+
+.. |Build Status| image:: https://travis-ci.org/ebertolazzi/Clothoids.svg?branch=master
+   :target: https://travis-ci.org/ebertolazzi/Clothoids
+.. |View ebertolazzi/Clothoids on File Exchange| image:: https://www.mathworks.com/matlabcentral/images/matlab-file-exchange.svg
+   :target: https://it.mathworks.com/matlabcentral/fileexchange/64849-ebertolazzi-clothoids

Rakefile

@@ -146,7 +146,7 @@ task :osx_3rd do
   FileUtils.cp 'CMakeLists-cflags.txt', 'submodules/quarticRootsFlocke/CMakeLists-cflags.txt'
   FileUtils.cp 'CMakeLists-cflags.txt', 'submodules/GenericContainer/CMakeLists-cflags.txt'
   FileUtils.cd 'submodules'
-  puts "\n\nSUBMODULES (for SPLINES)\n\n".green
+  puts "\n\nSUBMODULES (for CLOTHOIDS)\n\n".green
   sh "rake build_osx"
   FileUtils.cd '..'
 end
@@ -159,7 +159,7 @@ task :linux_3rd do
   FileUtils.cp 'CMakeLists-cflags.txt', 'submodules/quarticRootsFlocke/CMakeLists-cflags.txt'
   FileUtils.cp 'CMakeLists-cflags.txt', 'submodules/GenericContainer/CMakeLists-cflags.txt'
   FileUtils.cd 'submodules'
-  puts "\n\nSUBMODULES (for SPLINES)\n\n".green
+  puts "\n\nSUBMODULES (for CLOTHOIDS)\n\n".green
   sh "rake build_linux"
   FileUtils.cd '..'
 end
@@ -173,7 +173,7 @@ task :win_3rd, [:year, :bits] do |t, args|
   FileUtils.cp 'CMakeLists-cflags.txt', 'submodules/GenericContainer/CMakeLists-cflags.txt'
   args.with_defaults( :year => "2017", :bits => "x64" )
   FileUtils.cd 'submodules'
-  puts "\n\nSUBMODULES (for SPLINES)\n\n".green
+  puts "\n\nSUBMODULES (for CLOTHOIDS)\n\n".green
   sh "rake build_win[#{args.year},#{args.bits}]"
   FileUtils.cd '..'
 end

Xcode/Clothoids.xcodeproj/xcuserdata/enrico.xcuserdatad/xcschemes/xcschememanagement.plist

@@ -27,22 +27,22 @@
 		<key>testG2stat.xcscheme_^#shared#^_</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>6</integer>
+			<integer>3</integer>
 		</dict>
 		<key>testG2stat2arc.xcscheme_^#shared#^_</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>5</integer>
+			<integer>11</integer>
 		</dict>
 		<key>testG2statCLC.xcscheme_^#shared#^_</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>8</integer>
+			<integer>5</integer>
 		</dict>
 		<key>testIntersect.xcscheme_^#shared#^_</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>3</integer>
+			<integer>8</integer>
 		</dict>
 		<key>testIntersect2.xcscheme_^#shared#^_</key>
 		<dict>
@@ -52,17 +52,17 @@
 		<key>testIntersect3.xcscheme_^#shared#^_</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>4</integer>
+			<integer>7</integer>
 		</dict>
 		<key>testPolyline.xcscheme_^#shared#^_</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>11</integer>
+			<integer>4</integer>
 		</dict>
 		<key>testTriangle2D.xcscheme_^#shared#^_</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>7</integer>
+			<integer>6</integer>
 		</dict>
 	</dict>
 	<key>SuppressBuildableAutocreation</key>