Commit Graph

768 Commits

Author SHA1 Message Date
Sébastien Loriot 9bd9c68b83 update LGPL[23]+ and GPL[23]+ SPDX tags
ack -l --no-svg "SPDX-License-Identifier: GPL-3.0\+" | xargs sed -i "s/SPDX-License-Identifier: GPL-3.0+/SPDX-License-Identifier: GPL-3.0-or-later/"
ack -l --no-svg "SPDX-License-Identifier: LGPL-3.0\+" | xargs sed -i "s/SPDX-License-Identifier: LGPL-3.0+/SPDX-License-Identifier: LGPL-3.0-or-later/"
ack -l --no-svg "SPDX-License-Identifier: GPL-2.0\+" | xargs sed -i "s/SPDX-License-Identifier: GPL-2.0+/SPDX-License-Identifier: GPL-2.0-or-later/"
ack -l --no-svg "SPDX-License-Identifier: LGPL-2.0\+" | xargs sed -i "s/SPDX-License-Identifier: LGPL-2.0+/SPDX-License-Identifier: LGPL-2.0-or-later/"
2019-10-18 21:57:54 +02:00
Maxime Gimeno 22b8e0ccb8 Add some IO sections 2019-09-17 14:32:40 +02:00
Sébastien Loriot fbafb9d06f fix remaining mismatches and fix bugs 2019-07-10 11:40:45 +02:00
Laurent Rineau 4fbf00fb8a CMake>=3.13: opt for for new policies up to 3.15 2019-06-19 14:34:59 +02:00
Andreas Fabri 4581f1b7a8 Morte replacements 2019-06-05 08:39:55 +02:00
Andreas Fabri 5532b84b4f nullptr_t -> std::nullptr_t 2019-06-05 07:28:56 +02:00
Andreas Fabri e2d19b0c8d Replace NULL and Nullptr_t with nullptr and nullptr_t 2019-06-04 23:45:44 +02:00
Laurent Rineau b8fe6b10ee Merge pull request #3804 from afabri/CGAL_tests_must_not_include_basic-GF
Do not include <CGAL/basic.h>
2019-05-21 16:37:01 +02:00
Laurent Rineau d13b57d054 Merge pull request #3877 from sloriot/CGAL-fix_warnings
Fix warnings
2019-05-06 15:30:47 +02:00
Michael Hemmer 6415f3cddb Fix in CGAL package Mesh_2
GitOrigin-RevId: a24f22bd01
2019-04-24 15:18:32 +02:00
Andreas Fabri ab0b6eae36 Remove unnecessary include directories 2019-04-15 12:54:37 +02:00
Sébastien Loriot f62624c4f9 replace cpp11::tuple by std::tuple 2019-03-29 13:28:33 +01:00
Andreas Fabri a1609350aa Remove #include<CGAL/basic.h> amd put what is needed if something is missing 2019-03-27 15:21:33 +01:00
Andreas Fabri a472c24185 http:/www.boost.org -> https://www.bost.org 2019-03-20 08:59:22 +01:00
Andreas Fabri 6f836b5827 T2,T3,Mesh_2: backticks, lowercase, capitalize 2019-03-04 11:03:44 +01:00
Laurent Rineau 2671d056cf Merge pull request #3685 from afabri/CGAL-cleanup-GF
CGAL:  Clean up examples and tests
2019-02-28 20:48:48 +01:00
Andreas Fabri 7fa9781894 Remove derivation as workaround for a typedef 2019-02-14 12:12:01 +01:00
Sébastien Loriot 246d89b91f add missing upper case letters 2019-02-14 11:01:28 +01:00
Sébastien Loriot 59bc453b42 first batch of replacement for level 1 in classified ref man
command used:
grep -l  "##" */doc/*/PackageDescription.txt | xargs  sed -i  -E 's/\#\#\s*([[:print:]]+[[:alnum:]])\s*\#\#\s*$/\\cgalCRPSection{\1}/'
2019-02-14 10:32:39 +01:00
Maxime Gimeno 6cff52c485 write_vtu uses write_vtu_with_attributes 2019-02-04 10:04:19 +01:00
Maxime Gimeno ad300da617 Fix write_vtu_with_argumetns 2019-01-30 16:55:27 +01:00
Maxime Gimeno e456d29abf WIP write_vtu_with_attributes 2019-01-25 16:10:03 +01:00
Laurent Rineau c7b95e25c5 Rename two write_points functions as well 2019-01-21 16:32:37 +01:00
Laurent Rineau 8f658695f8 Rename internal methods to avoid a namespace class
There was two methods named `CGAL::write_points_tag`. I renamed then
to:
  - `write_c3t3_points_tag`, and
  - `write_cdt_points_tag`.
2019-01-21 16:17:28 +01:00
Laurent Rineau dbd569d51c Fix the result of check_headers 2019-01-17 18:29:27 +01:00
Sébastien Loriot eadb08d976 replace mode by a np 2019-01-17 16:03:48 +01:00
Laurent Rineau c1d4608665 My changes to output_to_vtu 2019-01-17 16:03:43 +01:00
Laurent Rineau 1754057d24 My changes to write_vtu 2019-01-16 16:50:45 +01:00
Sébastien Loriot 3a7269b8f6 improve doc 2019-01-16 12:00:07 +01:00
Maxime Gimeno 1006be85bd Fix Conflicts 2019-01-09 12:29:20 +01:00
Maxime Gimeno 7b13f4a969 Add misisng license header, rename vtu functions and update change.md 2018-11-23 10:11:23 +01:00
Laurent Rineau f3a0fe0d8b
Try another workaround 2018-11-22 09:17:45 +00:00
Andreas Fabri 1137fa7313 Quiet compiler. Tomorrow's testsuite will show if we apply it everywhere 2018-11-21 16:10:17 +01:00
Maxime Gimeno 33482dc532 Fix conflicts 2018-11-21 10:55:09 +01:00
Maxime Gimeno 5180876290 Fix ambiguity between 2D and 3D write_VTU and restore gone bool binary in write_VTU 3D 2018-11-21 10:48:16 +01:00
Guillaume Damiand 7d406fbb9c
Merge branch 'master' into CGAL-cmake_cleanup-gdamiand 2018-11-05 07:32:58 +01:00
Maxime Gimeno 08a98a5603 Update Changes.md 2018-10-30 11:51:34 +01:00
Maxime Gimeno 33a3996fa1 Rename write_VTU and write_VTP 2018-10-29 15:02:20 +01:00
Maxime Gimeno 63488d81d1 Update Changes and doc 2018-10-29 12:59:44 +01:00
Maxime Gimeno 5f38a107a1 Update. 2018-10-29 11:50:57 +01:00
Guillaume Damiand ef771d0f97 Re-add include({CGAL_USE_FILE}) is demo with core or image io, and set(CMAKE_INCLUDE_CURRENT_DIR ON) in others. 2018-10-19 09:51:14 +02:00
Guillaume Damiand 92ba7fa6c9 Update minimum cmake required version in all CMakeLists.txt 2018-10-18 14:49:23 +02:00
Guillaume Damiand 0c2dcf7208 Re-add include({CGAL_USE_FILE} ) in each CMakeLists.txt where CGAL is used with some component. 2018-10-18 14:38:42 +02:00
Guillaume Damiand 0bd9088b5a Remove all include( ) and include( CGAL_CreateSingleSourceCGALProgram ) in CMakeLists.txt; they are no more required. 2018-10-17 14:17:08 +02:00
Maxime Gimeno 9e929e39a0 Clarifies the doc 2018-10-09 14:49:08 +02:00
Maxime Gimeno 14c526a378 Add constrained edges to vtu output for cdt 2018-10-09 14:42:42 +02:00
Maxime Gimeno b380bd8b31 Doc for write_unstructured_grid_2 2018-10-08 16:25:51 +02:00
Sébastien Loriot ea240cfac5 use \PkgXXX instead of \PkgXXXSummary 2018-10-08 10:28:44 +02:00
Sébastien Loriot a2e8a1c68f add the suffix Ref to doxygen link to reference 2018-10-08 10:26:56 +02:00
Maxime Gimeno e8cf3f3192 add license includes 2018-10-05 17:09:43 +02:00
Maxime Gimeno 0c800d5830 Add SPDX stuff 2018-10-05 11:48:46 +02:00
Maxime Gimeno 99832879ed Add missing files 2018-10-04 14:08:52 +02:00
Sébastien Loriot b0b80148ea remove deprecated file 2018-08-21 14:03:11 +02:00
Mael Rouxel-Labbé 26c857a431 Moved unary/binary_function to CGAL::cpp98 2018-06-13 15:58:19 +02:00
Laurent Rineau 2766e1ff5d Merge 'master' and fix conflicts 2018-05-28 16:40:09 +02:00
Andreas Fabri 71ccb7d576 Add BGL as dependency 2018-05-23 11:48:59 +02:00
Andreas Fabri 6e828da0e9 Move stuff to CGAL/boost/parameter 2018-05-23 11:48:59 +02:00
Andreas Fabri f6cd1e0bcf Factorize boost parameters in the file CGAL/boost/parameter.h 2018-05-23 11:48:59 +02:00
Andreas Fabri f76575b587 To import the internal namespace parameters is a mistake 2018-05-23 11:48:59 +02:00
Laurent Rineau 05d7baceb1
Merge branch 'master' into Mesh_3-improve_polylines_to_protect-GF 2018-05-16 11:36:24 +02:00
Laurent Rineau ae0b45b79f Fix a compilation bug if Mesh_3 and Mesh_2 are both used
The conflict is withing the Boost parameters defined for Lloyd 2D and
Lloyd 3D.
2018-05-15 15:13:05 +02:00
Sébastien Loriot c2c2c1e498 improve phrasing 2018-05-11 23:06:40 +02:00
Sébastien Loriot 0b505bb746 remove unused figure 2018-05-11 23:04:39 +02:00
Andreas Fabri b4f16e759c Remove a redundant figure and add the word 'conforming' 2018-05-09 10:05:27 +01:00
Sébastien Loriot 01af331c72 use https for all links to www.cgal.org and doc.cgal.org 2018-03-14 15:59:38 +01:00
Laurent Rineau 0a74393dcf Commit all new dependencies files 2018-03-06 18:44:48 +01:00
Laurent Rineau 78e7060525 Merge pull request #2712 from afabri/CGAL-VC+warnlevel_4-GF
Deal with VC++ warnings of level /W4
2018-02-19 14:27:06 +01:00
Sébastien Loriot 483f69728e Refresh branch 2018-02-12 22:21:38 +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
Andreas Fabri 4ef0bdbcb6 Suppress this warning not globally in disable_warnings.h 2018-01-24 14:21:16 +00:00
Simon Giraudot 6269309d86 Use CGAL include for boost counting/transform iterators everywhere 2018-01-23 11:09:52 +01:00
Andreas Fabri fb51a69c7c Mesh_2 2018-01-17 16:50:21 +00:00
Laurent Rineau 1c2e9df8cf Merge branch 'releases/CGAL-4.11-branch' 2017-12-19 16:29:10 +01:00
Laurent Rineau 5181cd7474 Merge branch 'releases/CGAL-4.10-branch' into releases/CGAL-4.11-branch
# Conflicts:
#	Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/measure.h
2017-12-19 16:19:22 +01:00
Jane Tournois c55d75ede8 sq_circumradius cannot be computed on an infinite facet
there was no need to check if a face is in domain, but we still need to check
whether it is infinite
2017-12-15 10:24:11 +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
Laurent Rineau bbee705221 Add compilation tests for demos 2017-11-16 18:38:15 +01:00
Sébastien Loriot 8cdfad0d08 add missing URL and Id tags 2017-11-15 22:58:57 +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
Laurent Rineau 3ff09bc549 Merge pull request #2580 from lrineau/CGAL-Support_CMake_3.10-GF
Renew the handle of policies, for CMake-3.10
2017-11-15 16:47:42 +01:00
Jane Tournois e888bd46c1 the convergence criterion does not need to check "is_in_domain" for incident faces
anyway we do not compute the criterion for constrained vertices, nor for non-moving vertices
2017-11-13 15:31:36 +01:00
Jane Tournois e499208f5c add missing namespace 2017-11-13 15:27:07 +01:00
Laurent Rineau 86fb40832a Merge pull request #2580 from lrineau/CGAL-Support_CMake_3.10-GF
Renew the handle of policies, for CMake-3.10
2017-11-13 12:01:39 +01:00
Laurent Rineau c6068691fa Merge pull request #2547 from lrineau/CMake-parse_CTest_XML_output-lrineau
CGAL testsuite implemented with CTest plus Python (part.1)
2017-11-13 11:13:54 +01:00
Sébastien Loriot ee57fc2d6c add SPDX identifier for files under the GPL-3+ license 2017-11-12 10:17:51 +01:00
Sébastien Loriot 0698f79aff add SPDX identifier for files under the LGPL-3+ license 2017-11-12 10:17:50 +01:00
Sébastien Loriot a05b134a6b add SPDX identifier for files under the boost license 2017-11-12 10:17:50 +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
Laurent Rineau 488c3e2879 Merge pull request #2462 from sloriot/CGAL-fix_warnings_g++7
Fix some warnings
2017-10-13 17:04:02 +02:00
Laurent Rineau 00d444e84c Merge pull request #2462 from sloriot/CGAL-fix_warnings_g++7
Fix some warnings
2017-10-13 16:54:52 +02:00
Laurent Rineau c9cc90e630 Merge pull request #2467 from lrineau/Mesh_2-fix_clusters-GF
Mesh 2: fix clusters (issue #2456)
2017-10-11 19:14:33 +02:00
Laurent Rineau 7e9f756935 Replace all std::unary_function by CGAL::unary_function 2017-10-04 15:57:09 +02:00
Laurent Rineau 81662e0c00 More Mesh_2 debug, for clusters 2017-09-26 15:13:53 +02:00
Laurent Rineau a2dd20af02 Bug fix
Fix #2456

When two clusters share a subsegment, the subsegment is split at its
middle, instead of using the length imposed by the clusters. If the
clusters were partially refined before that subsegment is split, one
must reset the clusters, because the minimal length may have changed.
2017-09-26 15:13:53 +02:00
Sébastien Loriot c3e7ade8b4 fix warnings 2017-09-25 09:09:54 +02: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
Laurent Rineau 3e5ed94661 Do check the dependencies of Mesh_2 2017-04-06 17:37:10 +02:00
Andreas Fabri 3112b11e67 Add license check; Add defines for test_lipschitz.cpp 2017-04-06 17:32:50 +02:00
Andreas Fabri dfb37af958 test dependencies in Mesh_2 2017-04-06 13:16:35 +02:00
Laurent Rineau af38caef16 Better CMake API for TBB
- new CMake module `CGAL_target_use_TBB` that defines a function, that
  enables TBB per target.
- `UseTBB.cmake` is deprecated.
2017-03-27 18:04:54 +02:00
Laurent Rineau a3ddaa132f Define and use a new CMake API for CGAL
For the moment, the new API is used only in:

- `examples/Mesh_2/CMakeLists.txt`
- `demo/Triangulation_2/CMakeLists.txt`
2017-03-27 17:23:26 +02: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
Sébastien Loriot 19ab4c1907 fix non utf-8 character 2017-01-19 15:20:24 +01:00
Andreas Fabri f9ada57886 Mesh_2: Initialize to avoid warning 2016-11-14 09:14:30 +01:00
Laurent Rineau 223c1cf5a4 Merge pull request #1530 from lrineau/Installation-compute_dependencies-GF
Compute and fix packages dependencies
2016-10-05 13:11:04 +02:00
Laurent Rineau 3f052834bd Split Mesh_2
There is a new `Mesher_level` package, that gathers the foundation
files (mesher levels and auxiliary files) for `Mesh_2`,
`Surface_mesher`, and `Mesh_3`.
2016-09-30 15:23:16 +02:00
Laurent Rineau 51f5697d3d Add missing #include 2016-09-30 15:23:14 +02:00
Laurent Rineau a59084cc79 Fix missing includes 2016-09-30 15:22:26 +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
Sébastien Loriot c869ee6855 update cmake scripts with at least one example requiring Core 2016-03-24 16:40:57 +01:00
Sébastien Loriot 4c29bf1b44 CMAKE_SOURCE_DIR -> CMAKE_CURRENT_SOURCE_DIR 2016-03-24 16:33:46 +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 2d191d6651 commit CMakeLists.txt for all examples and tests 2016-03-07 17:39:36 +01:00
Sebastien Loriot 807825109a Merge pull request #745 from afabri/Mesh_2-WunusedParameter-GF
Mesh_2 suppress an "unused parameter" warning concerning boost
2016-02-16 16:35:18 +01:00
Andreas Fabri aff5dbc5c9 check for boost version < 1.60 2016-02-15 19:15:06 +01:00
Philipp Möller 0a04a3a48f Use CGAL_DOC_VERSION 2016-02-11 15:37:54 +01:00
Simon Giraudot 6607436610 Move #pragma at beginning/end of document 2016-02-05 15:32:19 +01:00
Andreas Fabri c473841ad2 suppress a warning 2016-02-05 14:59:10 +01:00
Sébastien Loriot 443b8cc2d7 precompute area functor 2016-02-01 10:23:29 +01:00
Sébastien Loriot 72c8aa7b05 make 2D-lloyd working with the projection traits 2016-01-29 15:16:51 +01:00
Sébastien Loriot 1fc7e45cde fix typo 2016-01-13 08:17:29 +01:00
Laurent Rineau 4638645a01 Merge PR #597 into Mesh_3-manifold_criterion-lrineau
Conflicts:
	Polyhedron/demo/Polyhedron/Plugins/Mesh_3_plugin/Mesh_3_plugin.cpp
	Polyhedron/demo/Polyhedron/Plugins/Mesh_3_plugin/Mesh_3_plugin_cgal_code.cpp
2016-01-08 17:41:02 +01:00
Sébastien Loriot e64ae35a6e Merge pull request #542 from bo0ts/Documentation-release_build2-pmoeller
Allow to build the documentation in a release
2016-01-07 09:21:46 +01:00
Laurent Rineau 3a4acc64de cleanup
Remove all directories and files listed in ./dont_submit. I have
verified that their usefulness is rather low.
2015-12-31 18:13:17 +01:00
Laurent Rineau e0f8f4f85f Refresh the branch Mesh_3-manifold_criterion-lrineau
For the moment, the manifold feature is no longer working.

Merge remote-tracking branch 'cgal-dev/Mesh_3-manifold_criterion-lrineau' into Mesh_3-manifold_criterion-lrineau

Conflicts:
	Mesh_3/include/CGAL/Mesh_3/Mesh_complex_3_in_triangulation_3_base.h
	Mesh_3/include/CGAL/Mesh_3/Mesher_3.h
	Mesh_3/include/CGAL/Mesh_3/Refine_facets_3.h
	Polyhedron/demo/Polyhedron/Polyhedron_3.cpp
	Polyhedron/demo/Polyhedron/Polyhedron_demo_mesh_3_plugin.cpp
	Polyhedron/demo/Polyhedron/Polyhedron_demo_mesh_3_plugin_cgal_code.cpp
2015-12-18 14:55:20 +01:00
Philipp Möller 71b4e9c515 Use CGAL_FULL_VERSION in all Doxyfile.in 2015-12-17 16:33:28 +01:00
Philipp Möller 81a8f982dc Handle the easy INPUT cases
If INPUT is just PKG/doc/PKG, handle it automatically.
2015-12-10 17:00:26 +01:00
Andreas Fabri 0e59c3488a 12 -> 8 2015-12-07 17:36:11 +01:00
Andreas Fabri dd17f1ad5d Set BOOST_PARAMETER_MAX_ARITY to the needed value in the concerned packages 2015-12-01 17:05:53 +01:00
Sébastien Loriot 6d5a92ebcb try to improve cgalRequires removal 2015-11-23 22:06:06 +01:00
Maxime Gimeno 7b4267c162 Replacement of cgalRequires
-fix for #291
2015-11-23 22:06:06 +01:00
Andreas Fabri 2ce8b07ec0 Define BOOST_PARAMETER_MAX_ARITY in <CGAL/config.h>
This macro has to be larger than the default value
and it must be set before including <boost/parameter.hpp>

Instead of setting it to 12 in the packages that
need it, we do this in <CGAL/config.h> and produce
an error if a user has set it to a value < 12
2015-11-16 11:21:31 +01:00
Sebastien Loriot 2e493f297b Merge pull request #389 from afabri/CGAL-Qt3-GF
Remove Qt3 based demos
2015-10-23 17:08:49 +02:00
Sébastien Loriot eb4f860f3b remove mentions of Qt3 2015-10-05 15:19:58 +02:00
Andreas Fabri 38d063539a cleanup 2015-10-02 08:17:19 +02:00
Guillaume Damiand cf1c0ea0ca Merge branch 'CGAL_headers_only-gdamiand_cjamin-OLD' into CGAL_headers_only-gdamiand_cjamin 2015-10-01 09:12:55 +02:00
Sébastien Loriot 50595505c4 Merge branch 'Fix_warnings-GF'
Fixes warnings in various packages

Successfully tested in CGAL-4.7-Ic-87
Approved by the release Manager
2015-07-17 14:21:21 +02:00
Sébastien Loriot d26e112cf4 fix warnings 2015-07-15 16:57:38 +02:00
Laurent Rineau 15c1469a54 CGAL requires CMake>=2.8.11. 2015-07-10 17:01:42 +02:00
Laurent Rineau 3ec0c69f8f We want 2.8.10 for all demos
Previous versions are not tested by the CGAL daily test suite.
2015-07-09 17:50:22 +02:00
Sébastien Loriot 722abba27b cosmetic changes to remove mentions of QT4 2015-07-07 18:00:43 +02:00
Laurent Rineau e5bcdc5f3e Update all CMakeLists.txt
- CMake 2.8.11 or later is now required
- GLEW is no longer used by demo/Polyhedron/
2015-07-06 18:14:34 +02:00
Jane Tournois 1de18c20a8 avoid returning a ref to temporary object 2015-06-01 14:50:51 +02:00
Jane Tournois 81d77803d3 avoid storing a std::pair
this is an attempt to fix the compilation error in the testsuite
for clang-6.0 and cpp11
2015-06-01 14:50:40 +02:00
Jane Tournois 90a2ba7345 avoid unused variable warning 2015-05-20 14:31:43 +02:00
Jane Tournois bcf4e13beb fix unused variable warning 2015-05-20 12:23:38 +02:00
Jane Tournois 717fa0a3fa fix doxygen warning 2015-05-19 10:02:28 +02:00
Jane Tournois 828eed2b24 calling a constructor from a constructor is cpp11 2015-05-19 10:01:00 +02:00
Jane Tournois 8511ff88b8 add copyright 2015-05-19 09:07:54 +02:00
Jane Tournois cac6609c53 use CGAL assertions 2015-05-19 09:07:54 +02:00
Jane Tournois b7b8be3500 test compilation of new constructor 2015-05-19 09:07:54 +02:00
Jane Tournois 13aa560db6 fix warning about variable "tr" not used 2015-05-19 09:07:54 +02:00
Jane Tournois 10affa9072 fix conversion warning 2015-05-19 09:07:53 +02:00
Jane Tournois 3f798a6542 add another pragma to ignore warning from clang 2015-05-19 09:04:28 +02:00
Jane Tournois 8e61cfdd49 new attempt to fix unused variables warning from boost with clang
and add namespace CGAL for Lloyd 2D parameters
2015-05-19 09:04:28 +02:00
Jane Tournois 6808066af3 fix warning from boost with gcc 2015-05-19 09:04:28 +02:00
Andreas Fabri 2cda7ff7f6 min() -> (min)() 2015-05-19 09:04:28 +02:00
Andreas Fabri 74c817fe7f Add an include 2015-05-19 09:04:27 +02:00
Jane Tournois 0c6b51f46f add newline at end of file
fix warnings
2015-05-19 09:04:27 +02:00
Jane Tournois 9322f881c5 fix unused variable, and implement barycentric coordinates on an edge 2015-05-19 09:04:27 +02:00
Jane Tournois 7c03566d5a fix unused variable warning 2015-05-19 09:04:27 +02:00
Jane Tournois cc801f779f fix unused parameter warnings 2015-05-19 09:04:26 +02:00
Jane Tournois 1517354702 fix unused variable warning 2015-05-19 09:04:26 +02:00
Jane Tournois f8c3ef0a30 fix compilation for (max) 2015-05-19 09:04:26 +02:00
Sébastien Loriot 7cabb0c508 Merge branch 'rebase/Mesh_2-add_optimizers-GF-old' into rebase/Mesh_2-add_optimizers-GF
Conflicts:
	GraphicsView/demo/Triangulation_2/Constrained_Delaunay_triangulation_2.cpp
	GraphicsView/demo/Triangulation_2/Constrained_Delaunay_triangulation_2.ui
	Triangulation_2/include/CGAL/Constrained_Delaunay_triangulation_2.h
2015-05-19 09:01:20 +02:00
Sébastien Loriot 67049fbdd4 add missing typename 2015-05-19 08:54:37 +02:00
Sébastien Loriot f4addd127b fix compilation issue with g++ 2015-05-19 08:54:36 +02:00
Jane Tournois 83c415bca9 move Mesh_optimization_return_code from Mesh_3 to Mesh_2
Mesh_3 already depends on Mesh_2,
but not the other way around
2015-05-19 08:54:36 +02:00
Jane Tournois 07bd45535c fix typo 2015-05-19 08:54:35 +02:00
Jane Tournois 27ec7dd5db add the macros easily available and comment them 2015-05-19 08:54:35 +02:00
Jane Tournois c7138ff48d add barycentric coordinates to compute sizing at p inside a face
+ add code to interpolate on finite vertices of an infinite face

they are not used by default because it's expensive, unless the macro
CGAL_MESH_2_SIZING_FIELD_USE_BARYCENTRIC_COORDINATES is defined.
Can be useful to be more precise about the sizing
2015-05-19 08:54:35 +02:00
Jane Tournois f2e7a860de fix link 2015-05-19 08:54:34 +02:00
Jane Tournois 5e9773f390 fix link to Mesh_optimization_return_code from Mesh_3 2015-05-19 08:54:34 +02:00
Jane Tournois d3201da788 fix Laurent's email address 2015-05-19 08:54:34 +02:00
Jane Tournois 7886aca9e4 add a typedef 2015-05-19 08:54:33 +02:00
Jane Tournois 717e795c1a make the specification of DelaunayMeshFaceBase_2 complete
+ change access functions names to make them conform to CGAL
+ add preconditions in the code
2015-05-19 08:54:33 +02:00
Jane Tournois 4cf8655c00 move all the cdt.dual(v) code from Triangulation_2 to Mesh_2
we do not change the API of Triangulation_2 for now
maybe later, and this version should be easy to keep backward compatible
2015-05-19 08:54:33 +02:00
Jane Tournois 7870b54c06 add figures to the documentation 2015-05-19 08:54:15 +02:00
Guillaume Damiand 9c78897ba5 Merge branch 'CGAL_headers_only-gdamiand_cjamin-old' into CGAL_headers_only-gdamiand_cjamin 2015-03-16 14:00:43 +01:00
Jane Tournois 2b7d774c36 fix the convergence criterion 2014-11-28 12:59:31 +01:00
Jane Tournois c83641b7ef fix sections : meshing examples of "meshes" back in the "Meshes" section 2014-11-28 09:53:00 +01:00
Jane Tournois f1afe6a2ef add documentation for lloyd_optimize_mesh_2 2014-11-27 16:23:55 +01:00
Jane Tournois 33dd5d441d update package description 2014-11-27 13:22:00 +01:00
Jane Tournois 3cced7e6fc make the example simpler for the documentation 2014-11-27 13:21:04 +01:00
Jane Tournois 0d90d763c1 add a link to lloyd_optimize_mesh_2 2014-11-27 13:11:28 +01:00
Jane Tournois fbd42eb3b4 list of examples updated 2014-11-27 13:10:38 +01:00
Jane Tournois 4661c6765f remove using namespace parameters from example to make documentation clearer 2014-11-27 13:04:43 +01:00
Andreas Fabri 2916850771 use iformat for reading doubles 2014-11-26 16:53:50 +01:00
Jane Tournois d119879313 add namespace parameters for parameters of lloyd_optimize_mesh_2 2014-11-25 10:42:38 +01:00
Jane Tournois 8532b75851 add a test for lloyd_optimize_mesh_2 2014-11-24 17:01:40 +01:00
Jane Tournois bd08614cc1 fix compilation 2014-11-24 17:01:14 +01:00
Jane Tournois 7e037664e6 fix compilation when verbose mode is off 2014-11-24 17:00:29 +01:00
Jane Tournois f76c88f2fe cleaning 2014-11-24 15:03:35 +01:00
Jane Tournois 78eff786e5 fix missing parameter 2014-11-21 16:21:10 +01:00
Jane Tournois 3e8416954f add mark as a parameter for lloyd_optimize_mesh_2
this allow to choose (as in refine_Delaunay_mesh_2 if
the seeds describe the domain to be meshed (inside), or the complementary
2014-11-21 15:51:28 +01:00
Jane Tournois acdf610682 fix compilation when no seed is given 2014-11-21 11:23:07 +01:00
Jane Tournois e4161ce685 handle seeds in lloyd_optimize_mesh_2 2014-11-20 16:13:46 +01:00
Jane Tournois bd9bbd0427 remove Odt for now 2014-11-20 15:00:55 +01:00
Jane Tournois fbab5edb60 return Mesh_optimization_return_code as Mesh_3 optimizers do 2014-11-18 11:25:09 +01:00
Jane Tournois b2edb9d20b introduce freezing of vertices that do not move enough 2014-11-18 10:48:23 +01:00
Jane Tournois 338a9593f7 use boost named parameters as done in Mesh_3 2014-11-17 16:54:24 +01:00
Jane Tournois b641f2f257 use time limit 2014-11-17 16:53:25 +01:00
Guillaume Damiand ebc4300334 Header only for random.cpp.
For the header only version, the global variable default_random no more exist => we need to replace all occurences of default_random by a call to the global function get_default_random().
As usual, no modification for the non header only version.
2014-11-14 14:20:26 +01:00
Jane Tournois 562ef9f972 use Mesh_sizing_field as in Mesh_3 for Lloyd optimization
this avoids migration phenomena of vertices, that "break"
the distribution of points built during the refinement process
2014-11-14 13:04:48 +01:00
Jane Tournois be2003940f fix histogram function 2014-11-14 12:39:56 +01:00
Jane Tournois ab9811ad8b add output of angles histograms 2014-11-13 16:29:21 +01:00
Jane Tournois 8647878a6a use check_convergence() to stop optimization when vertices do not move enough
the convergence ratio is set to 0.001 by default

+ fix the use of moving_vertices for iterations after the first one
2014-11-12 17:13:18 +01:00
Jane Tournois 5e2fab9a51 add verbose stuff 2014-11-12 16:52:49 +01:00
Jane Tournois 89527055bb add update of blind-ness and inside-ness of facets to the optimization function 2014-11-12 15:48:35 +01:00
Jane Tournois e02773efd1 move files about sizing, and change template parameter. Geom_traits is enough 2014-11-12 15:42:27 +01:00
Jane Tournois e971112c1c this file should remain in the demo folder 2014-11-12 13:07:02 +01:00
Jane Tournois d071e71773 move demo "include" code to Mesh_2 "include" code. These files are needed for Lloyd 2014-11-12 12:51:09 +01:00
Jane Tournois 5666a7db17 add code for Lloyd optimization, and in the demo 2014-11-07 17:07:14 +01:00
Jane Tournois d53c211d83 cleaning 2014-11-07 16:16:03 +01:00
Jane Tournois 74581dcb5d do not put constrained vertices in the moving_vertices container
and add verbose code
2014-11-07 14:13:17 +01:00
Jane Tournois 6726d84dbc fix compilation when verbose mode is off 2014-11-07 12:20:47 +01:00
Jane Tournois 6ad29f3299 fix border/constrained cases 2014-11-07 12:20:19 +01:00
Jane Tournois ee5c1cea4b add code for optimization.
- Lloyd move should be ok, but faces blindness is not updated properly until now
- ODT move still needs to be redefined when constraints appear
2014-10-10 15:37:25 +02:00
Jane Tournois 62098e8445 introduce framework for mesh optimization
- for now, Lloyd_move and Odt_move return an empty move
- example added
2014-10-09 13:51:22 +02:00
Jane Tournois 4cf43198e2 dual(v) returns an OutputIterator that collects rays and segments
to do so, use the Dispatch_output_iterator

- Constrained Voronoi diagram is now a class that has a pointer to a CDT
as member. We don't need an extra CDT anymore
- update examples
- also update the CDT 2 demo to see Voronoi cells, that are only valid when the
triangulation is Delaunay (constrained or not)
2014-10-07 15:03:41 +02:00
Clement Jamin f3c00442fd Merge branch 'Mesh_3-parallel-cjamin-old' into Mesh_3-parallel-cjamin 2014-05-14 19:05:40 +02:00
Clement Jamin 157cd0465f Merge branch 'Mesh_3-parallel-cjamin-old' into Mesh_3-parallel-cjamin
Conflicts:
	Mesh_3/demo/Mesh_3/Mesh_3_optimization_plugin_cgal_code.cpp
	Mesh_3/doc/Mesh_3/Concepts/MeshCellBase_3.h
	Mesh_3/include/CGAL/Mesh_3/C3T3_helpers.h
	Mesh_3/include/CGAL/Mesh_3/Mesh_complex_3_in_triangulation_3_base.h
	Mesh_3/include/CGAL/Mesh_3/Mesh_global_optimizer.h
	Mesh_3/include/CGAL/Mesh_3/Sliver_perturber.h
	Mesh_3/include/CGAL/Mesh_3/Slivers_exuder.h
	Mesh_3/include/CGAL/Mesh_3/Triangulation_helpers.h
	Mesh_3/include/CGAL/Mesh_3/config.h
	Mesh_3/include/CGAL/Mesh_3/vertex_perturbation.h
	Mesh_3/include/CGAL/Polyhedral_mesh_domain_3.h
	Mesh_3/include/CGAL/exude_mesh_3.h
	Mesh_3/test/Mesh_3/test_meshing_utilities.h
	Triangulation_3/include/CGAL/Triangulation_cell_base_with_circumcenter_3.h
2014-03-10 17:01:03 +01:00
Laurent Rineau ecd44ef651 Cosmetic changes
My coding style has evolved a lot since 2002!
2014-01-09 14:21:12 +01:00
Laurent Rineau 2c236ff01d Fix a bug in the constructor if Filter_circulator
The Intel Compiler 14.0, with -O2 or -O3, triggers a bug in the old
version of the code. After the construction of the filtered circulator,
`test(*this)` was not guaranteed. I am not sure if the bug is in the
code or in the compiler, but the constructor was an ugly piece of
code! (*this) was used in the body of the constructor in non obvious
ways. An object is reputed constructed once the internalizers are
evaluated, as far as I know, so probably the previous version of the
code was valid. However, that sound strange to copy an object inside the
body of the constructor of that object. Maybe that confused the
compiler.

Anyway, I have modified the implementation of that constructor in a
cleaner way, and I have added an assertion (that was failing with the
old implementation).
2014-01-09 14:15:45 +01:00
Sébastien Loriot 0fa2cacb60 remove doc_tex documentation (including developer manual) and old manual tools 2013-12-03 17:27:02 +01:00
Clement Jamin ec8e949d21 Merge branch 'Mesh_3-parallel-cjamin-old' into Mesh_3-parallel-cjamin 2013-11-21 10:50:55 +01:00
Laurent Rineau 38e5dc102d Remove execution permissions 2013-11-13 14:05:43 +01:00
Clement Jamin 41929ed520 Merge branch 'Mesh_3-parallel-cjamin-old' into Mesh_3-parallel-cjamin
Conflicts:
	Mesh_3/doc/Mesh_3/Concepts/MeshCellBase_3.h
	Mesh_3/dont_submit
	Triangulation_3/doc/TDS_3/CGAL/Triangulation_data_structure_3.h
	Triangulation_3/doc/TDS_3/Concepts/TriangulationDataStructure_3.h
	Triangulation_3/doc/Triangulation_3/CGAL/Delaunay_triangulation_3.h
	Triangulation_3/doc/Triangulation_3/CGAL/Regular_triangulation_3.h
	Triangulation_3/doc/Triangulation_3/CGAL/Triangulation_3.h
	Triangulation_3/doc/Triangulation_3/PackageDescription.txt
2013-09-25 11:47:43 +02:00
Clement Jamin 730d34bb23 Create a separate Mesher_level.h file for Mesh_3
Before, we were using the Mesher_level.h file of the Mesh_2 package,
but the parallel version introduced some changes and a
dependency from Mesh_2 to Mesh_3 that is not wished.
I restored the original Mesher_level.h file in Mesh_2.
2013-09-11 15:45:55 +02:00
Sébastien Loriot e8975dbac7 function documentation fixes
remove the repetition of the name of the function in its brief description
 add parenthesis for function matching "function\s+`[a-z0-9_]`"
2013-09-03 14:25:50 +02:00
Laurent Rineau bc03aaf30b Put doc/ in the global dont_submit file 2013-08-20 10:57:03 +02:00
Sébastien Loriot d282ade623 use \cgalCite instead of \cite
using perl -i -pe 's/\\cite\s*{?([a-zA-Z0-9:-]+)}?/\\cgalCite{$1}/g'
2013-08-05 18:25:26 +02:00
Sébastien Loriot b2ef3b8673 Merge branch 'doc-remove_gif-local'
Successfully test in CGAL-4.3-Ic-102

This commit fixes a few issues in the doxygen documentation and in particular
the figure for the generation of latex doc.

Approved by the interim release manager

xplain why this merge is necessary,
2013-07-26 17:50:07 +02:00
Sébastien Loriot 2dfe8a3d73 workaround for a doxygen bug: remove space after /!* to avoid a verbatim env
this happens if you have an empty line or the text directly after /!*
to find them in the generated documentation, grep for "pre class=\"fragment\""
(a few of them are legitimate however)
2013-07-25 14:58:53 +02:00
Clement Jamin 138710d997 Remove useless #include 2013-07-25 14:44:01 +02:00
Sébastien Loriot 519b301130 remove gif files from doxygen doc include path 2013-07-25 11:14:16 +02:00
Clement Jamin 206b20bc15 Merge branch 'Mesh_3-parallel-cjamin-old' into Mesh_3-parallel-cjamin 2013-07-02 17:37:50 +02:00
Laurent Rineau ba634e28fd Modularization of Mesh_3::Refine_facets_3
That class template now has a "base" class, to that is can be refined,
before the CRTP is applied to build the mesher level.
2013-06-27 17:10:59 +02:00
Sébastien Loriot 716f87d2d7 rename Hidden_type to unspecified_type and update its description 2013-06-13 18:48:58 +02:00
Clement Jamin bc360c8b13 Changes for GCC compilation + removed some trailing spaces 2013-06-07 17:40:53 +02:00
Ross Hemsley 4d9caf3763 Added names that were missing into the Doxyfile.in entries.
Also modified Installation/CMakeLists.txt to push the version number variable to the parent level
so that it can be accessed by the documentation
2013-05-30 17:55:43 +02:00
Philipp Möller 4d469821f7 Generated Doxyfile.in and dependencies 2013-05-30 14:13:47 +02:00
Clement Jamin dbe1c9c597 Reversed the "facet_not_in_its_cz" variables by removing the "not" 2013-05-28 15:56:22 +02:00
Clement Jamin 127926aa14 Proof-reading + minor changes
Renamed unlock_all_tls_locked_locations => unlock_all_points_locked_by_this_thread
2013-05-28 15:07:20 +02:00