Commit Graph

848 Commits

Author SHA1 Message Date
Jane Tournois c6b0013475 apply doc bug fixes 2014-02-07 10:17:25 +01:00
Jane Tournois 7965a7b727 avoid the use of a deprecated class in documentation 2014-02-06 15:58:39 +01:00
Jane Tournois 75771bacb3 rename Regular_triangulation_cell_base_with_circumcenter_3
to Regular_triangulation_cell_base_with_weighted_circumcenter_3
2014-02-06 15:50:38 +01:00
Jane Tournois fc2be4f233 implement documentation improvements 2014-02-06 15:02:09 +01:00
Jane Tournois 94c78a771e change the "see also" 2014-01-24 12:36:27 +01:00
Jane Tournois 3cffb10ccf remove "see also" to deprecated class 2014-01-24 12:27:10 +01:00
Jane Tournois b4b367deae make cell base Delaunay in DT3 2014-01-24 12:15:23 +01:00
Jane Tournois fa2568d9b1 fix weighted_circumcenter() 2014-01-24 11:55:42 +01:00
Jane Tournois 88666391da introduce weighted_circumcenter() for RegularTriangulationCellBase_3
weighted_circumcenter() replaces circumcenter() in the regular framework,
which is not a member of TriangulationCellBase_3 anymore.

Triangulation_cell_base_with_circumcenter_3 is deprecated and replaced by:
Delaunay_triangulation_cell_base_with_circumcenter_3
and
Regular_triangulation_cell_base_with_circumcenter_3.

Implement the changes in documentation, Triangulation_3 code and Mesh_3 code.
2014-01-16 16:55:19 +01:00
Jane Tournois 63a0262e74 fix documentation of Triangulation_cell_base_with_circumcenter_3
the base class should be Cb, that implements TriangulationCellBase_3 OR
RegularTriangulationCellBase_3
2014-01-10 16:18:19 +01:00
Jane Tournois a95c93cfe5 more minor documentation bug fixes 2014-01-10 15:13:52 +01:00
Jane Tournois b35a610b12 fix inheritance of cell bases
there were conflicts between Point (weighted) and Bare_point
as return types of the circumcenter() function
2014-01-10 14:55:15 +01:00
Jane Tournois 7b55c30ba5 fix the use of Triangulation_cell_base_with_circumcenter
Triangulation_cell_base_with_circumcenter should not be responsible for
computing the circumcenter value. It is only responsible for its caching.
The Cell_base used as second template parameter should make the construction,
in the circumcenter() function.

Also fix the order of derivation in Mesh_cell_base_3
2014-01-10 14:31:02 +01:00
Jane Tournois 93c596d23a fix last commit.
DelaunayTriangulationTraits_3 has already been turned to TriangulationTraits_3
but this 'Delaunay' has been forgotten.
2014-01-10 14:05:53 +01:00
Jane Tournois feb309fcb3 add some extra precision 2014-01-09 14:49:44 +01:00
Jane Tournois 14087917e6 documentation bug fix :
- add a Point_3 type to TriangulationCellBase_3.h
- do not use DelaunayTriangulationTraits everywhere but TriangulationTraits as often as possible
2014-01-09 14:43:26 +01:00
Jane Tournois bf9e964f0e remove macro CGAL_REGULAR_TRIANGULATION_3_USE_CIRCUMCENTER_CACHE
has been checked and is always activated
2014-01-09 12:05:50 +01:00
Jane Tournois 9b68754c47 fix documentation 2014-01-06 12:24:40 +01:00
Jane Tournois 88eddc7e8b Merge branch 'Triangulation_3-regular_cell_base_with_circumcenter-GF-old' into Triangulation_3-regular_cell_base_with_circumcenter-GF 2014-01-03 18:03:01 +01:00
Jane Tournois 5fe628385a * added a circumcenter member function
to be used for cached weigthed circumcenters.
2014-01-03 17:49:49 +01:00
Jane Tournois 43de5769cb Revert "added a circumcenter member function"
This reverts commit d21d374732.

this file is obsolete and replaced by a .h file for doxygen
2014-01-03 17:48:13 +01:00
Jane Tournois 7ad8520d8f Merge branch 'Mesh_3-add_sliver_perturber_criteria-GF-old' into Mesh_3-add_sliver_perturber_criteria-GF 2013-12-10 15:58:46 +01:00
Clement Jamin f35ceac262 Doc: fix the wrong "inherited by" and "inherits" 2013-12-09 15:40:50 +01:00
Clement Jamin bdd16dccdb Doc: typos and minor changes following Monique's review. 2013-12-05 17:45:40 +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
Jane Tournois 0812cc5686 documentation bug fix for inexact_locate
inexact_lodate that needs x(), y() and z() functions to be available on query point
2013-12-02 14:51:52 +01:00
Clement Jamin 1d58bfb1da Changed encoding (UTF8) 2013-11-27 10:09:02 +01:00
Clement Jamin 651dd7dc50 Changed encoding (UTF8) 2013-11-26 12:52:25 +01:00
Clement Jamin fdc154ddb0 Changed encoding 2013-11-26 10:30:44 +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
Sébastien Loriot 14850a1703 add missing examples in doc 2013-11-12 10:44:06 +01:00
Sébastien Loriot ef95745bba fix hierarchy of examples 2013-10-24 16:41:06 +02:00
Jane Tournois c557164a44 Merge branch 'Mesh_3-add_sliver_perturber_criteria-GF-old' into Mesh_3-add_sliver_perturber_criteria-GF 2013-10-24 16:28:10 +02:00
Laurent Rineau 3ad8f223cd Fix the documentation of the Tds parameters of cell base classes
And add see also between Compact_mesh_cell_base_3 and Mesh_cell_base_3.
2013-10-16 16:34:41 +02:00
Clement Jamin d3a9b3c46d Parallel T3 speed-up chart. 2013-10-16 13:03:49 +02:00
Clement Jamin e7f0e99cfa More details about parallelism 2013-10-16 12:41:41 +02:00
Clement Jamin 6b65ad71da Changes in the "lock data structure" concept and models
The concept is now much more generic (SurjectiveLockDataStructure).
The names have been changed accordingly.
2013-10-16 12:17:56 +02:00
Clement Jamin 0d0d54277d Doc corrections according to Monique's review + clean-up conflicts marks 2013-10-15 16:42:00 +02:00
Clement Jamin 18fb7fb37a Small enhancements in the TDS & T3 doc 2013-10-15 15:47:19 +02:00
Clement Jamin bd9c3abf91 Doc: explain Concurrency_tag 2013-10-15 15:31:47 +02:00
Clement Jamin 4273b11f63 TDS: implementation history 2013-10-15 11:19:51 +02:00
Clement Jamin 5101c3d2e7 Added my name in a few places + implementation history 2013-10-15 11:14:58 +02:00
Clement Jamin 26c3ce0c40 Doc: the parallel DT3 must use the default compact location policy 2013-10-15 11:04:50 +02:00
Clement Jamin 8ec2a3eb2f Corrected the typedefs 2013-10-15 10:46:49 +02:00
Clement Jamin 29525dfcb7 Back-quotes for could_lock_zone and true + minor fixes + replace 0 by NULL 2013-10-15 10:27:35 +02:00
Clement Jamin 85bba6fa44 Minor fixes in the doc. 2013-10-15 10:06:24 +02:00
Clement Jamin 72d877ffc7 Updated the TDS typedef in the T3 demo 2013-10-14 17:55:13 +02:00
Clement Jamin f55d87fb33 Clarify the Concurrency_tag documentation 2013-10-14 17:52:45 +02:00
Laurent Rineau 240385d011 Add expensive assertions to check the circumcenter cache 2013-10-14 17:12:54 +02:00
Clement Jamin a27e2d225f Moved "Parallel Algo" into section "Software Design" 2013-10-03 17:32:44 +02:00
Clement Jamin 495330542f Custom CMakeLists.txt for T3 examples (parallel code) 2013-10-02 18:46:26 +02:00
Clement Jamin c4c736ed36 Added parallel examples in user doc 2013-10-02 18:25:45 +02:00
Clement Jamin 6a22496da1 Removed useless #include 2013-10-02 18:25:22 +02:00
Clement Jamin b14ae925cd Added parallel examples 2013-10-02 18:15:48 +02:00
Clement Jamin 985eac26f5 Added examples for parallel triangulations 2013-10-02 18:05:52 +02:00
Clement Jamin ffd3bc7d1e Removed unused type 2013-10-02 17:48:48 +02:00
Clement Jamin 9aeba5f5f5 Documentation: added Lock_data_structure typedef 2013-10-02 17:43:24 +02:00
Clement Jamin 88ed4cc924 Removed strategies in T3 benchmark and Dummy TDS 2013-10-01 17:27:21 +02:00
Clement Jamin 72aaf18f49 Minor fixes in documentation 2013-10-01 17:25:44 +02:00
Clement Jamin 2706cbfeff Compact_container: erase counter strategy is now automatically deduced from T.
If the T::increment_erase_counter() function exists, then the erase counter
value will be updated by the Compact_container.
2013-09-30 18:25:41 +02:00
Clement Jamin 2944261214 Merge branch 'Mesh_3-parallel-cjamin' of ssh://scm.cgal.org/var/git/cgal into Mesh_3-parallel-cjamin 2013-09-25 10:50:46 +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 a173372321 Fixes for GCC + removed trailing spaces 2013-09-25 11:18:18 +02:00
Andreas Fabri 5c454cec64 add missing includes 2013-09-13 12:43:01 +02:00
Laurent Rineau bc03aaf30b Put doc/ in the global dont_submit file 2013-08-20 10:57:03 +02:00
Sébastien Loriot e92ed28faa Merge branch 'Triangulation_3-fix_insert_with_info_fast_location-local'
bug-fix: make the function inserting a range of points with info
         working with the Fast_location tag

Successfully tested in 4.3-Ic-113
2013-08-09 18:13:38 +02:00
Sébastien Loriot 9a8eeb8867 remove Figure work added by the macro+postprocessing 2013-08-08 23:01:09 +02:00
Sébastien Loriot 197b9210ee add missing advanced 2013-08-08 20:02:07 +02:00
Sébastien Loriot 9c2f35ed1a using cgalHeading instead of h3 2013-08-07 10:06:49 +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 5676ca70cf add missing \cite 2013-08-05 17:07:46 +02:00
Sébastien Loriot ded66799a6 make the insertion of a range of points with info working with hierarchy 2013-08-05 15:03:46 +02:00
Sébastien Loriot 35533f760c link less 2013-08-05 12:11:06 +02:00
Sébastien Loriot a5b291bc19 link less 2013-08-05 12:09:35 +02:00
Sébastien Loriot 31c2cecdda change order 2013-08-05 10:31:13 +02:00
Sébastien Loriot 6d9aeba4f2 add missing links 2013-08-05 09:48:45 +02:00
Sébastien Loriot e1465ce617 add missing template parameter
requested by Monique
2013-08-05 09:18:41 +02:00
Sébastien Loriot da4fccda97 remove doc of hierarchy vertices and triangulation, deprecated since 3.6 2013-08-05 09:12:07 +02:00
Sébastien Loriot f2219bfa46 update classifed ref man 2013-08-05 09:03:23 +02:00
Sébastien Loriot 56faf80e3d Merge branch 'Triangulation_3-array-glisse'
fixes  array initialization in c++11

Successfully tested in CGAL-4.3-Ic-103
Approved by the interim release manager
2013-07-29 07:44:03 +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
Sébastien Loriot 143a2181b3 add latex format for \imagei doxygen command
perl -pe 's/^(\s*)\\image\s+html\s+(.*)\s*$/$1\\image html $2\n$1\\image latex $2\n/' -i
2013-07-25 11:50:53 +02:00
Sébastien Loriot 74a1ac055e remove pdf files from doxygen doc include path 2013-07-25 11:15:18 +02:00
Sébastien Loriot 519b301130 remove gif files from doxygen doc include path 2013-07-25 11:14:16 +02:00
Sébastien Loriot 4389b0bac8 remove the usage of gif in the doxygen doc as pdflatex does handle them
replace the files with png
2013-07-25 11:06:13 +02:00
Clement Jamin 5c17ff1591 Adjustments in the doc following some discussions with Mariette. 2013-07-24 15:06:07 +02:00
Clement Jamin 18895e6f42 Use the TBB's scalable allocator in a few places
=> better scalability of the parallel remove
2013-07-23 17:51:06 +02:00
Clement Jamin fc10668b31 Spelling mistake + minor change 2013-07-23 17:17:38 +02:00
Marc Glisse 530f20179c Finish Philipp's patch on initializing arrays. 2013-07-23 15:58:04 +02:00
Clement Jamin 8aaee67985 Removed some "p_" prefixes in variable names 2013-07-12 15:49:45 +02:00
Clement Jamin a664003024 Doc fix 2013-07-12 15:08:29 +02:00
Clement Jamin 1eae99f042 Doc: escaped double quotes + use unspecified_type instead of Hidden_type 2013-07-12 15:01:41 +02:00
Clement Jamin f5e6d4e00d More replacement in the doc of \R by \mathbb{R}
(cherry picked from commit 2ddd815832)
2013-07-10 19:41:39 +02:00
Clement Jamin 2ddd815832 More replacement in the doc of \R by \mathbb{R} 2013-07-10 19:40:29 +02:00
Sébastien Loriot 33f0193644 replace in the doc \R by \mathbb{R}
\R is not a valid latex command
I used: sed -i 's/\\f$\s*\\R/\\f$ \\mathbb{R}/g'

(cherry picked from commit d4d9bc212b)
2013-07-10 17:22:29 +02:00
Sébastien Loriot d4d9bc212b replace in the doc \R by \mathbb{R}
\R is not a valid latex command
I used: sed -i 's/\\f$\s*\\R/\\f$ \\mathbb{R}/g'
2013-07-10 17:07:43 +02:00
Clement Jamin 09d75308fb Untabify 2013-07-02 18:16:22 +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
Clement Jamin b0e1f0ead1 Benchmark "Delaunay with Fast_location" for sequential benchmark only 2013-07-02 13:48:22 +02:00
Clement Jamin 159ca5fab8 Remove the "TBB malloc proxy" recommendation, since we don't use it anymore 2013-07-02 13:32:15 +02:00
Clement Jamin fcdf906f06 Option to add temporary points on a far sphere before insertion
Helps to reduce contention on the infinite vertex
But removing those points in the end takes time
so it's only worth it when points lie on a surface.
2013-07-02 12:57:26 +02:00
Clement Jamin 8181587ed7 Fix tabs + better profiling 2013-07-02 11:37:32 +02:00
Jane Tournois 56d733b254 Merge remote-tracking branch 'origin/Mesh_3-improvements-GF'
Several improvements of Mesh_3, including
- speedup of optimizers,
- make inexact_locate public in Triangulation_2 and Triangulation_3,
- compactify mesh_cell_base and mesh_vertex_base,
- fix of documentation,
- and more

Small feature :
https://cgal.geometryfactory.com/CGAL/Members/wiki/Features/Small_Features/Various_improvements_of_Mesh_3

Approved by the release manager.
2013-07-01 16:25:56 +02:00
Clement Jamin 04c1a83977 Minor alignment change 2013-06-28 15:18:13 +02:00
Clement Jamin 079c39eef4 Update CMakeLists according to changes in FindTBB 2013-06-28 15:16:49 +02:00
Clement Jamin 2dc6c405b8 Drop the use of the TBB malloc proxy, use TBB allocators manually instead
The TBB's "malloc proxy", which allows to replace all calls to the standard
allocators by calls to the TBB scalable allocator, is not available on MacOS.
Instead, we use the TBB allocators manually, where relevant.
2013-06-27 15:29:47 +02:00
Laurent Rineau 0033b19157 Fix a precondition (bad copy paste from `vertex_triple_index()`) 2013-06-25 17:05:47 +02:00
Jane Tournois dcf22e09bb improve documentation for inexact_locate (because 'inexact_locate' does not come after 'locate' in the output of long descriptions of functions) 2013-06-24 13:28:44 +02:00
Jane Tournois 404f2e0e3c merge 2013-06-21 10:01:19 +01: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 d0ca823aa8 Doc minor change 2013-06-11 13:23:54 +02:00
Clement Jamin bc360c8b13 Changes for GCC compilation + removed some trailing spaces 2013-06-07 17:40:53 +02:00
Clement Jamin 440a654a58 Added a concurrency-safe version of DT3::find_conflicts + better doc 2013-06-05 17:23:19 +02:00
Clement Jamin b43f28c6ab Renamed p_could_lock_zone + use NULL instead of 0 + CGAL_TRIANGULATION_3_PROFILING 2013-06-05 13:44:34 +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 d4e379ba82 Small fixes in the generated Doxyfile.in 2013-05-30 15:32:33 +02:00
Philipp Möller 4d469821f7 Generated Doxyfile.in and dependencies 2013-05-30 14:13:47 +02:00
Jane Tournois 6b63e0585c fix documentation of inexact_locate 2013-05-30 11:02:17 +02:00
Jane Tournois efec975bd8 add comment about what inexact_locate returns when triangulation is not in full dimension 2013-05-28 16:08:05 +02:00
Jane Tournois af93d9b5ad doc improvement suggested by Monique 2013-05-28 16:03:27 +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 eeeb6cc841 Smaller tag names (continued) 2013-05-28 15:42:39 +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
Sébastien Loriot 6cea5e34e7 add missing deprecated commands 2013-05-28 14:26:36 +02:00
Sébastien Loriot 2d947dc1d6 new cgal doxygen debug macro to put the text inside a div 2013-05-28 13:24:24 +02:00
Sébastien Loriot 170c619a2d fix places where the <div> added by cgalAdvanced conflicts with other html tags 2013-05-28 09:51:49 +02:00
Sébastien Loriot 7e15467c72 new cgal doxygen advanced macro to put the text inside a div 2013-05-27 19:36:33 +02:00
Clement Jamin 9aefdbe939 Replaced is_base_of by is_convertible. 2013-05-23 17:49:24 +02:00
Clement Jamin 4a3a43d0e6 Minor fix + output 2013-05-23 17:48:32 +02:00
Clement Jamin f555e6bc49 Updated T3 benchmark 2013-05-23 14:23:58 +02:00
Clement Jamin 86c223059e Untabify 2013-05-23 13:50:19 +02:00
Clement Jamin c471fb442d Untabify + removed useless spaces 2013-05-21 11:13:36 +02:00
Sébastien Loriot 8d602ed8c2 Merge branch 'triangulation_3-copy_tds-sloriot'
Approved by the release manager

Conflicts:
	Alpha_shapes_3/test/Alpha_shapes_3/copy_tds.h
	Triangulation_2/doc/TDS_2/Concepts/TriangulationDataStructure_2.h

it introduces a more general copy_tds that allows to copy tds with different types of simplices.
2013-04-29 11:09:01 +02:00
Sébastien Loriot 4231db6412 add missing \ccc in doc_tex 2013-04-29 10:44:51 +02:00
Laurent Rineau 76da6cf570 Add missing #include
That fixes the compilation when no <CGAL/Gmp*.h> header is included.
2013-04-24 12:57:57 +02:00
Sébastien Loriot 0138f3639d fix typo 2013-04-19 14:50:43 +02:00
Sébastien Loriot 0beb1a8861 add an extra overload to please MSVC 2013-04-19 08:38:56 +02:00
Jane Tournois edf8dbccc7 fix documentation as asked by small feature 'inexact_locate' reviewers 2013-04-18 13:32:36 +02:00
Clement Jamin afde58115f Better phrasing in documentation 2013-04-17 17:34:33 +02:00
Andreas Fabri 169b10eea7 Add a missing ';'
(cherry picked from commit 2f95d1584a)
2013-04-17 17:11:27 +02:00
Clement Jamin 972d5e1898 Removed some useless "CGAL::" 2013-04-17 16:07:29 +02:00
Clement Jamin f381378d19 Updated Triangulation_3 doc (parallel version) 2013-04-16 16:28:10 +02:00
Clement Jamin 6cc5d746aa Removed a warning 2013-04-16 16:25:16 +02:00
Laurent Rineau 8eb51bee7a Reformat the long list of #ifdef/#else
And display the typeid of the kernel, for checking.
2013-04-16 16:08:33 +02:00
Clement Jamin 3a4caaaa1c Changed the place of the erase counters.
Changed Compact_container_strategy_XXX::Uses_erase_counter type + moved the erase counters from Triangulation_ds_xxx_base_3 to Mesh_xxx_base_3.
2013-04-16 15:31:36 +02:00
Sébastien Loriot 498492e770 add set_infinite_vertex to Triangulation_3 and use it with copy_tds
the 2D version already exists
2013-04-12 16:04:59 +02:00
Sébastien Loriot f9e0c97aac for convenience add a default to simple converter
it is useful if you want to copy the tds of a familly
alpha-shape into a fixed one
2013-04-11 20:03:32 +02:00
Sébastien Loriot 0a1bb3e4cd boolean set to false at the first run, otherwise it is always true 2013-04-11 19:05:18 +02:00
Sébastien Loriot 260e99ef20 add points created in the triangulation 2013-04-11 18:13:02 +02:00