Commit Graph

212 Commits

Author SHA1 Message Date
Sébastien Loriot a2e8a1c68f add the suffix Ref to doxygen link to reference 2018-10-08 10:26:56 +02:00
Maxime Gimeno d5dbdcba25 Replace random.h by CGAL::Random 2018-09-18 10:20:57 +02:00
Maxime Gimeno 63cb481dd2 Change header guard to something not forbidden. 2018-09-17 12:28:10 +02:00
Sébastien Loriot 376bc42716 update URL and use https 2018-09-04 13:29:51 +02:00
Mael Rouxel-Labbé 26c857a431 Moved unary/binary_function to CGAL::cpp98 2018-06-13 15:58:19 +02:00
Laurent Rineau 0a74393dcf Commit all new dependencies files 2018-03-06 18:44:48 +01:00
Laurent Rineau 697ed680ee Merge pull request #2803 from sgiraudot/OTR-Fix_error_test_vertex_edge-GF
OT Reconstruction: Fix test_vertex_edge bug by not copying the TDS
2018-02-14 15:34:46 +01:00
Simon Giraudot 7536af7106 Fix test_vertex_edge bug by not copying the TDS 2018-02-07 14:43:09 +01:00
Maxime Gimeno 688b5dd06e Move dependencies creation to package_info and add dependencies to git 2018-02-02 12:08:05 +01:00
Maxime Gimeno 8bde832931 Fix METIS headers in BGL 2018-02-02 12:08:05 +01:00
Maxime Gimeno a676d5a60e Try to fix errors in classification checks 2018-02-02 12:08:05 +01:00
Maxime Gimeno acd0a72edf Modify travis script to test dependencies 2018-02-02 12:08:05 +01:00
Maxime Gimeno ae36b452bc Add dependencies of all packages 2018-02-02 12:08:05 +01:00
Laurent Rineau f310fc588d
Merge pull request #2690 from sgiraudot/Classification-ETHZ_random_forest-GF
Classification: ETHZ Random Forest
2018-02-01 17:35:30 +01:00
Simon Giraudot 6269309d86 Use CGAL include for boost counting/transform iterators everywhere 2018-01-23 11:09:52 +01:00
Simon Giraudot a2f58027ee Use new PSP API in OTR demo 2018-01-12 09:59:43 +01:00
Simon Giraudot 367c6cfc69 Fix warnings 2018-01-12 09:59:43 +01:00
Sébastien Loriot 5226311108 use OpenGL function through the viewer 2018-01-12 09:59:43 +01:00
Simon Giraudot 897021677e Use CGAL::approximate_sqrt() to handle exact kernel 2018-01-12 09:59:43 +01:00
Simon Giraudot 0fa9e17213 Remove deprecated std::unary_function 2018-01-12 09:59:42 +01:00
Simon Giraudot 403420a6d8 Remove OTR_NO_TOLERANCE macro 2018-01-12 09:59:42 +01:00
Simon Giraudot bb13a0e7ef Add new figure for Wasserstein tolerance example (+ minor fixes in user manual) 2018-01-12 09:59:42 +01:00
Simon Giraudot ae3dfd8c1f Fix comments in example (from review) 2018-01-12 09:59:42 +01:00
Simon Giraudot ab08e1e499 Document run_under_wasserstein_tolerance() in user manual 2018-01-12 09:59:42 +01:00
Simon Giraudot f3bf054a23 Add new example with Wasserstein tolerance 2018-01-12 09:59:42 +01:00
Simon Giraudot 1b05ce304b Add a note on Wasserstein distance to make it clear it is not Hausdorff 2018-01-12 09:59:42 +01:00
Simon Giraudot 7b8186a05b Load XY files with weights, compute average spacing and better displays 2018-01-12 09:59:41 +01:00
Simon Giraudot f54a26f987 More decimalson the dialog window 2018-01-12 09:59:41 +01:00
Simon Giraudot 9c852ec864 Fix uninitialized variable 2018-01-12 09:59:41 +01:00
Simon Giraudot 7843436277 Generalization: use total weight instead of number of samples (useful if weights != 1) 2018-01-12 09:59:41 +01:00
Simon Giraudot 69447be1f7 Update demo to handle tolerance based API 2018-01-12 09:59:41 +01:00
Simon Giraudot a32d3534ac Keep track of the number of samples for edges and costs 2018-01-12 09:59:41 +01:00
Simon Giraudot 69f3917e66 Make tolerance homogeneous to a distance 2018-01-12 09:59:41 +01:00
Simon Giraudot e38b12c83f Add method to run the algorithm under a Wasserstein tolerance 2018-01-12 09:59:40 +01:00
Simon Giraudot 685f8e4701 Update demo with Wasserstein tolerance API 2018-01-12 09:59:40 +01:00
Laurent Rineau 3c6640bf59 Merge pull request #1436 from lrineau/CGAL-new_cmake-GF
Renewal of CMake scripts: header-only, ctest, CMake>=3.1

# Conflicts:
#	Installation/config/testfiles/CGAL_CFG_NESTED_CLASS_FRIEND_DECLARATION_BUG.cpp
2017-12-05 18:20:05 +01:00
Maxime Gimeno 30171e03ee fix opr2 demo 2017-11-29 11:34:26 +01:00
Maxime Gimeno 66df33abea Use Qt opengl in remaining demos 2017-11-29 11:34:26 +01:00
Laurent Rineau 6ec4c12031 Do not use OpenGL directly, but only using Qt5 OpenGL classes 2017-11-28 17:58:12 +01:00
Laurent Rineau 25dffa1710 Modern usage of Qt5 CMake scripts, to allow CMAKE_WARN_DEPRECATED 2017-11-17 12:54:13 +01:00
Laurent Rineau bbee705221 Add compilation tests for demos 2017-11-16 18:38:15 +01:00
Laurent Rineau a9365554c9 Merge pull request #2550 from sloriot/CGAL-add_SPDX_tags
Add SPDX License Identifier
2017-11-15 16:48:27 +01:00
Sébastien Loriot ee57fc2d6c add SPDX identifier for files under the GPL-3+ license 2017-11-12 10:17:51 +01:00
Laurent Rineau 62c70d41ca Renew the handle of policies, for CMake-3.10
Now that we require CMake>=3.1, we can forget a lot of old CMake policies.

`CMP0053` `OLD` behavior is still needed, because of a bug in Qt5 CMake files, but it will
not be set with CMake>=3.10. Let's assume that a recent CMake version means
a recent Qt5 version.
2017-11-06 14:58:36 +01:00
Maxime Gimeno 5ae96fc2aa Explicitely set the policy of CMP0053 to OLD to silent the warning when it is not found. 2017-05-23 16:12:56 +02:00
Simon Giraudot ab33988eb5 Remove unused parameter 2017-05-16 14:13:43 +02:00
Simon Giraudot b1268f0a95 Silence unused argument 2017-05-16 14:13:43 +02:00
Simon Giraudot 4166de5024 Fix warning unused variable 2017-05-16 14:13:43 +02:00
Sébastien Loriot a89ccb10e7 remove non UTF-8 characters 2017-01-19 15:20:26 +01:00
Sébastien Loriot 50510c05ea add include directive for license of all GPL header files
done using:
ack-grep "^GPL" */package_info/*/license.txt -l | awk -F "/" '{print $1}' > /tmp/gpl_packages
for i in `cat /tmp/gpl_packages | \
          grep -v Operations_on_polyhedra | \
          grep -v Algebraic_kernel_for_circles | \
          grep -v Algebraic_kernel_for_spheres | \
          grep -v Polyhedron_IO`;
do
  echo $i
  python Scripts/developer_scripts/add_license_in_pkg_header.py $i
done
python Scripts/developer_scripts/add_license_in_pkg_header.py Operations_on_polyhedra Polygon_mesh_processing
python Scripts/developer_scripts/add_license_in_pkg_header.py Algebraic_kernel_for_circles Circular_kernel_2
python Scripts/developer_scripts/add_license_in_pkg_header.py Algebraic_kernel_for_spheres Circular_kernel_3
python Scripts/developer_scripts/add_license_in_pkg_header.py Polyhedron_IO Polyhedron
2017-01-19 15:20:25 +01:00
Andreas Fabri d872b4131e make a static variable of a member function class local 2016-11-07 15:20:37 +01:00
Laurent Rineau 9a0bb54922 Merge pull request #1438 from sloriot/CGAL-clean_up_projects_name_cmake
Clean up projects name in cmake scripts
2016-10-05 13:02:25 +02:00
Clément Jamin bfb5d02d2b Add link to demo to OTR2 2016-09-27 14:59:37 +02:00
Sébastien Loriot 7e2ee496de update project name of cmake scripts of tests 2016-09-08 00:26:37 +02:00
Sébastien Loriot e78bef8a9c update project name of demos 2016-09-08 00:13:34 +02:00
Sébastien Loriot 6b338eeb1f improve the name of projects in cmake scripts of examples 2016-09-08 00:02:55 +02:00
Laurent Rineau 53c4718361 Merge pull request #1322 from cjamin/OTR2-bug_fixes-cjamin
2 bug fixes for Optimal_transportation_reconstruction_2
2016-08-29 12:29:37 +02:00
Simon Giraudot 124c65065a Merge pull request #1351 from sgiraudot/OTR-Bugfix_loose_bbox_computation-GF
OT reconstruction: fix: loose bbox length computation
2016-08-19 08:17:41 +02:00
Simon Giraudot 32fb8ce9dd Bugfix: loose bbox length was badly computed 2016-08-18 11:29:02 +02:00
Simon Giraudot fa7493fdf7 Prevent verbosity level of 1 to display messages at every iteration 2016-08-16 09:42:03 +02:00
Clement Jamin c9948de032 Smaller fix for #965 (thank you Laurent) 2016-07-29 16:07:39 +02:00
Clement Jamin 086ea8160a Try to fix issue #965: link with pthread when CImg is there 2016-07-29 13:36:58 +02:00
Clement Jamin 5ba623be09 Bugfix: a test was missing 2016-07-29 12:40:00 +02:00
Laurent Rineau b045ca4b02 Merge pull request #1287 from sgiraudot/OTR-Some_bugfixes-GF
OT Reconstruction: some bugfixes in the demo
2016-07-21 16:07:15 +02:00
Simon Giraudot a30163e1d5 Bugfix: properly clear scene and memory leak fix 2016-07-20 10:08:33 +02:00
Simon Giraudot f974433669 Bugfix: percentage was not taken into account 2016-07-20 10:05:26 +02:00
Simon Giraudot b0af782dbb Bugfix: use new bbox API 2016-07-20 10:05:02 +02:00
Simon Giraudot e09c51c32a Add possibility to init the triangulation with a custom set of points 2016-07-20 09:45:50 +02:00
Simon Giraudot 26995a29fa Update example 2016-07-18 10:00:29 +02:00
Simon Giraudot 261304126c Test update 2016-07-18 09:53:00 +02:00
Simon Giraudot 18f859193c Return boolean when run or run_until + function to count isolated vertices 2016-07-18 09:52:39 +02:00
Sébastien Loriot d4daac525e restore default constructor removed in 3658aa04 that is used by the demo
the method to insert a single point is made public to protect incorrect uses
2016-07-13 13:00:10 +02:00
Sébastien Loriot 0bd1bd808a make the testsuite compile the demo
the target name in the cmake script and the name of the cpp file
that contains the main function must be identical
2016-07-13 12:57:59 +02:00
Sebastien Loriot 1e2a4596ec Merge pull request #1229 from sloriot/OTR2-epeck
Make it work with Epeck
2016-07-06 17:42:48 +02:00
Laurent Rineau 5ebfefe72c Merge pull request #894 from gdamiand/CGAL_headers_only_step1-gdamiand_cjamin
CGAL header-only: step 1

(I actually do this merge for the Github interface for mobile phones! How much does that add to my geek-value?)
2016-07-05 19:50:36 +02:00
Sébastien Loriot 3b8d38eb2f fix conversion warning 2016-07-05 09:15:20 +02:00
Sébastien Loriot ec592cfa6d default value for relevance is 1 2016-07-04 10:51:12 +02:00
Sébastien Loriot e3a44a9d75 remove the flag CGAL_USE_PROPERTY_MAPS_API_V1 and keep only new API 2016-07-04 10:17:38 +02:00
Sébastien Loriot faf7e42cc3 add a test checking algo compiles and run with epeck 2016-07-01 10:54:38 +02:00
Sébastien Loriot 3009712a64 round relocation to double when using a non floating point number type
due to iterative relocation, multiprecision number types increase
very quickly (even if we use only one relocation step)
2016-07-01 09:09:42 +02:00
Sébastien Loriot e912899d51 change bounds in the assertion as less isolated vertices seems to be generated 2016-06-30 14:07:11 +02:00
Sébastien Loriot 29aacb5dc7 remove use of numeric_limits 2016-06-30 12:24:49 +02:00
Sébastien Loriot 54948a4b25 only display info in the console if verbose > 0 2016-06-30 12:09:23 +02:00
Sébastien Loriot a51683e497 remove test that was using non-documented API 2016-06-30 12:09:17 +02:00
Sébastien Loriot 3658aa045a remove bbox data member and initialize it when reading input points
This is a bug fix as the bbox data members were arbitrarily initialized
and the bbox used was not correct and could lead to use the infinite
vertex during the reconstruction.
I also removed the default constructor to avoid having a non initialized
bbox
2016-06-30 12:09:04 +02:00
Sébastien Loriot c1bdf2d713 add missing example input file 2016-06-30 12:08:42 +02:00
Sébastien Loriot d00bc1c7a9 double -> FT 2016-06-30 12:08:03 +02:00
Sébastien Loriot 174b1c3c7d rename and undef macro 2016-06-30 12:06:55 +02:00
Sébastien Loriot b6505b6e91 sqrt -> approximate_sqrt 2016-06-30 12:06:14 +02:00
Sébastien Loriot cc5b25b4fb fix author name 2016-06-30 12:06:09 +02:00
Andreas Fabri ba9f4435c2 Avoid the usage of EPS and use a predicate instead of a construction 2016-06-30 11:52:06 +02:00
Andreas Fabri 62e2396e03 use boost::container::deque; reserve() for a vector 2016-06-30 11:52:06 +02:00
Andreas Fabri 026ff882d3 No need to project for computing a line point distance; replace vector with deque 2016-06-30 11:52:05 +02:00
Andreas Fabri 845d9f0ad8 use faster intersection API 2016-06-30 11:52:05 +02:00
Guillaume Damiand 10469f9c4e Update with master 2016-05-25 10:58:55 +02:00
Andreas Fabri c89f4360ac fix typo 2016-04-05 12:50:42 +02:00
Andreas Fabri fe9535b157 Replace rand() 2016-04-05 12:46:23 +02:00
Laurent Rineau 50b55bd27c Merge pull request #890 from sloriot/CGAL-generate_CMakeLists-sloriot
Generate CMakelists
2016-03-29 11:02:17 +02:00
Sebastien Loriot 0a2afbfb45 Update Sample.h 2016-03-10 12:15:27 +01:00
Clement Jamin f2c68b25cd Update CMakeLists.txt of all demos for header-only mode 2016-03-09 17:23:20 +01:00
Sébastien Loriot 881e4d3199 request Core only in examples, tests and demos when really needed 2016-03-07 22:36:57 +01:00
Sébastien Loriot 45406a5296 Merge pull request #788 from bo0ts/Installation-split_config-pmoeller
Split CGALConfig.cmake and CGALExports.cmake
2016-03-06 15:36:55 +01:00
Simon Giraudot 2a123d498f Warning fix: shortened names in Otr2 demo 2016-02-23 07:23:22 +01:00
Simon Giraudot d5aa178015 Update missing namespace in demo 2016-02-19 09:28:08 +01:00
Simon Giraudot f08a451ad2 Update name in CMakeLists 2016-02-19 09:22:03 +01:00
Simon Giraudot 694fc35b89 Update namespace RS_2 to OTR_2 in include files 2016-02-19 09:21:18 +01:00
Simon Giraudot 5412ced7b4 Update reconstruction 2D name in examples 2016-02-19 09:17:31 +01:00
Simon Giraudot 45b9bf13c9 Update reconstruction 2D name in tests 2016-02-19 09:14:26 +01:00
Simon Giraudot a6128a2b9c Update name of reconstruction 2D in doc 2016-02-19 09:09:33 +01:00
Simon Giraudot 002859f842 Update name of reconstruction 2D in demo 2016-02-19 08:50:44 +01:00
Simon Giraudot 39ac3cb0d5 Change name of reconstruction 2D in includes 2016-02-19 08:47:47 +01:00
Simon Giraudot 9c800eaf46 Rename Reconstruction_simplification_2 files by Optimal_transportation_reconstruction_2 2016-02-19 08:41:05 +01:00