songsenand
/
cgal
mirror of https://github.com/CGAL/cgal
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
57,195 Commits 3 Branches 156 Tags 962 MiB
Commit Graph

702 Commits

Author SHA1 Message Date
Jane Tournois 1b0323c8b8 Merge branch 'Mesh_3-add_random_generator_to_mesh_domain-GF' into Mesh_3-compare_index-GF 2014-03-28 11:01:40 +01:00
Jane Tournois 993541644c move Has_timestamp to STL_extension/include/CGAL directory 
to avoid that Compact_container depends on Mesh_3
 2014-03-27 13:57:47 +01:00
Andreas Fabri fa9d5b7f93 Suppress a warning issued by VC12 2014-03-26 09:16:02 +01:00
Laurent Rineau b54be0ee3c Update the copyright header 2014-03-25 16:42:23 +01:00
Jane Tournois 3974278a3f Merge branch 'Mesh_3-compare_index-GF' into Mesh_3-add_random_generator_to_mesh_domain-GF 2014-03-20 15:16:12 +01:00
Marc Glisse 3168c851a1 Merge branch 'Kernel_d-rewrite-glisse-old' into Kernel_d-rewrite-glisse 
Conflicts:
	Kernel_d/doc_tex/Kernel_d/kernel_representation_d.tex
	Kernel_d/doc_tex/Kernel_d_ref/Homogeneous_d.tex
	Kernel_d/doc_tex/Kernel_d_ref/Kernel.tex
	Kernel_d/doc_tex/Kernel_d_ref/main.tex

Resolved by dropping those files.
 2014-03-12 12:38:08 +01: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 5a8cc40ad7 Fix a warning 
test/STL_Extension/test_Compact_container.cpp:110:34: warning: unused variable 't20' [-Wunused-variable]
 2014-02-21 17:41:31 +01:00
Jane Tournois 6af720cde8 remove useless typename(s) 2014-02-21 17:14:13 +01:00
Jane Tournois 9d19ac0f96 add a "less" function to CGAL_time_stamper 
and handle null pointers given to comparison
it is necessary for example in Triangulation_3::remove_3D
 2014-02-21 14:41:41 +01:00
Jane Tournois 22153ac273 make private the time_stamp_ variable 
and add time_stamp() and set_time_stamp() methods everywhere
 2014-02-20 16:18:49 +01:00
Jane Tournois 0740b3652f add class Has_timestamp not to modify the API of Compact_container 
- use the Has_timestamp operator in Compact_container
- add partial specialization to classes that need the time stamp (i.e.
Mesh_vertex_base, Compact_mesh_cell_base_3 and Mesh_cell_base_3)
- remove "ts" from classes where they were actually needed for compilation
purpose only (i.e. Kd_tree_node and Triangulation_ds_cell_base_3)
- rename "ts" to time_stamp_
 2014-02-20 15:53:36 +01:00
Jane Tournois b3eccc5905 determinism : add a template parameter to Compact_container 
we add a template parameter to Compact_container that is able to
set and get the "time stamps" stored in Vertex_handle, Cell_handle etc.
We previously made sure that these pointers are always compared using
the operator< of CC_iterator, inside Compact_container.h
 2014-02-18 17:25:50 +01:00
Sébastien Loriot 2629523702 remove make_sorted_pair from the documentation 
this function should probably be replaced by std::minmax, so no need
  to introduce a function to deprecate it then
 2014-02-18 11:30:24 +01:00
Clement Jamin d2c54d16b8 Fix unexisting "see also" 2014-02-17 09:35:56 +01:00
Clement Jamin b00eb1ffa2 Fixes the doc according to Monique's review 2014-02-17 08:06:49 +01:00
Clement Jamin 77b9ad86a7 Clarify the doc of CC_safe_handle 2014-02-17 08:05:14 +01:00
Jane Tournois 6db28ed43d move ts from Tds to Compact_container 
Tds now is back to its original version (not different from master)
 2014-02-14 17:15:33 +01:00
Andreas Fabri 83546c53b1 Add a time stamp in vertices and cells of triangulations and polyhedra 
and use this for operator< of handles in order to make mesh generation
 deterministic
 2014-02-13 19:46:34 +01:00
Laurent Rineau c24356e330 Protect the test of CGAL::copy_n 
CGAL::copy_n is deprecated, so 'test_namespaces.cpp' must not warn about
it, and the test cannot be done if CGAL_NO_DEPRECATED_CODE is defined.
 2014-01-31 16:50:36 +01:00
Laurent Rineau da3d641efe Add comments to #ifndef/endif 2014-01-31 16:50:20 +01:00
Sébastien Loriot 596e57a1b0 trivial doc polish (avoid long description to be generated) 2014-01-22 15:31:06 +01:00
Laurent Rineau 3ed92e1c1a Merge branch 'STL_Extension-Boolean_tag_Boost_Integral_Constant-lrineau' 
Small feature:
  cgal.org/wiki/Features/Small_Features/Boolean_tag_is_a_Boost_Integral_Constant

Now CGAL::Boolean_tag<true> and CGAL::Boolean_tag<true> are model of the
Boost concept "Integral Constant".

Tested in CGAL-4.4-Ic-84.
 2014-01-09 17:54:28 +01:00
Clement Jamin c81531bc80 Oops, I removed a line by mistake 2013-12-20 15:11:36 +01:00
Clement Jamin fc91cad0b1 Test 2013-12-20 15:05:14 +01:00
Clement Jamin 596c84ccb7 Benchmark 2013-12-20 15:05:04 +01:00
Clement Jamin 28c5fde142 Add an increment policy to the Compact_container, and an operator[] 2013-12-20 15:03:37 +01:00
Sébastien Loriot 59f476b5b4 Merge branch 'STL_Extension-fix_make_sorted_pair-local' 
Bug-fix when using make_sorted_pair on different types

  Successfully tested in CGAL-4.4-Ic-62
  Approved by the release manager
 2013-12-20 08:44:23 +01:00
Sébastien Loriot 3adb58e046 better support of heterogeneous but compatible types 2013-12-17 20:37:19 +01:00
Clement Jamin 5d1eacf16f rename get_erase_counter => erase_counter 
And add it to the concept ObjectWithEraseCounter
 2013-12-12 07:23:07 +01:00
Laurent Rineau dc6c20cfdb merge branch origin/Fix_leak-STL_Extension-GF 
Remove memory leaks detected by AddressSanitizer.
Tested in CGAL-4.4-Ic-54 and CGAL-4.4-Ic-55.
Approved by the release manager.
 2013-12-11 13:42:31 +01:00
Laurent Rineau 11c186e769 Fix a warning 2013-12-10 18:56:42 +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
Clement Jamin 4f27050f17 Added my name 2013-11-26 12:54:55 +01:00
Clement Jamin 1822e1c94f More detailed doc 2013-11-26 12:54:26 +01:00
Marc Glisse 8ddf8255d5 Merge branch 'Kernel_d-rewrite-glisse-old' into Kernel_d-rewrite-glisse 
Hopefully the doc will be easier to build this way.
 2013-11-23 12:34:18 +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
Marc Glisse b319b31825 Assume refcount>0 when copying. 
Hopefully it will help compilers understand that destructing a copy
can't bring the counter to 0.
 2013-11-16 12:14:44 +01:00
Andreas Fabri d8da1137cc Fix a memory leak in Handle_with_policy: 
A rep that points to another rep is like a handle
So if such a rep gets deleted the reference counter must be decremented
 2013-11-15 16:20:01 +01:00
Andreas Fabri 06009bfc03 fix leaks 2013-11-15 16:19:49 +01:00
Andreas Fabri 61298d3925 Fix memory leak in Compact_container::merge() 
We forgot to merge all_items
 2013-11-08 13:55:40 +01:00
Sébastien Loriot fd0e7756d5 add missing include 
trivial bugfix
 2013-10-29 13:05:44 +01:00
Sébastien Loriot 5f9ab81512 add the function make_sorted_pair 2013-10-18 10:44:54 -07:00
Sébastien Loriot 6a30252a82 remove not needed include directive 2013-10-18 09:22:14 -07:00
Clement Jamin 91bd59a3e4 Typo 2013-10-16 12:30:53 +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 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 c734677e9f Doc fixes: "p" => "point" + removed "embedded" 2013-10-15 09:43:28 +02:00
Clement Jamin f99355ce4e Doc fix 2013-10-14 18:13:39 +02:00
Clement Jamin 312ccf5398 Doc: replace "embed" by "store" 2013-10-14 18:10:58 +02:00
Clement Jamin a199ec9332 Rename params 2013-10-14 18:07:50 +02:00
Clement Jamin f0d470ae28 Removed get_erase_counter&co from the test 2013-10-14 17:54:15 +02:00
Clement Jamin e03b9aa762 get_cc_iterator => cc_iterator 2013-10-14 17:50:37 +02:00
Laurent Rineau e1a8bbf7af Do not test if CGAL_NO_DEPRECATED_CODE is defined 
Trivial-bug fix for master.
 2013-10-09 15:55:26 +02:00
Clement Jamin be66ce4a85 Moved the erase counter example to user doc + add Concurrent CC to user doc 2013-10-09 14:36:54 +02:00
Clement Jamin 5ff923bcfb Bug fix: use the right namespace (CCC_internal) 2013-10-02 10:48:59 +02:00
Clement Jamin 72aaf18f49 Minor fixes in documentation 2013-10-01 17:25:44 +02:00
Clement Jamin 5ccd315983 Edited Compact_container doc (erase counter, etc.) 2013-10-01 17:24:22 +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 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
Laurent Rineau fa7588e6e5 Restore correct permissions of files 
File created by the Windows port of Emacs, and then commited using the
Cygwin version of Git, have incorrect permissions: they are all executable!
Andreas works using that combination of software.
 2013-09-24 11:05:57 +02:00
Andreas Fabri 5237f4359f CGAL_USE variables 2013-09-18 12:17:24 +02:00
Andreas Fabri 6c547e5663 Mainly added includes 2013-09-13 22:24:30 +02:00
Laurent Rineau af6c0819d9 Remove warnings from test_N_tuple.cpp (that tests deprecated classes) 
Trivial bug-fix for master.
 2013-09-11 15:40:10 +02:00
Andreas Fabri 5026d0a4b6 really add the testsuite 2013-09-10 11:39:02 +02:00
Andreas Fabri 4a9be1f608 put the 'deprecated' macro at the right spot and add a testsiuite 2013-09-10 11:37:08 +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 224a54303a Make Tag_true and Tag_false be models of the Boost Integral Constant model 
http://www.boost.org/libs/mpl/doc/refmanual/integral-constant.html
 2013-08-27 17:07:24 +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 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 801708d322 Doc: added set_bbox 2013-07-25 11:13:20 +02:00
Clement Jamin aac6819640 Doc: Removed set_bbox from the concept 2013-07-24 19:31:42 +02:00
Clement Jamin 5c17ff1591 Adjustments in the doc following some discussions with Mariette. 2013-07-24 15:06:07 +02:00
Marc Glisse 7c574d3dd8 Rename Filtered_predicate since it isn't compatible with the old version. 2013-07-22 14:23:08 +02:00
Marc Glisse dafdb45786 Move is_iterator changes back to the original file. 2013-07-19 21:55:34 +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 838439b038 Merge branch 'Mesh_3-parallel-cjamin-old' into Mesh_3-parallel-cjamin 
Conflicts:
	Bounding_volumes/doc/Bounding_volumes/CGAL/Approximate_min_ellipsoid_d.h
	Installation/cmake/modules/FindTBB.cmake
	Installation/cmake/modules/UseTBB.cmake
	Mesh_3/doc/Mesh_3/CGAL/Mesh_triangulation_3.h
	Mesh_3/doc/Mesh_3/Mesh_3.txt
	Mesh_3/include/CGAL/Mesh_triangulation_3.h
	Surface_mesher/doc/Surface_mesher/Surface_mesher.txt
 2013-07-11 09:58:51 +02:00
Laurent Rineau e724c1f519 Fix end-of-lines and end-of-files 2013-07-04 11:51:23 +02:00
Clement Jamin 8b0edee1f4 Merge branch 'concurrency_in_cgal-cjamin-old' into concurrency_in_cgal-cjamin 2013-07-03 17:17:34 +02:00
Clement Jamin 31342deb22 Better doc for tags. 2013-07-03 13:01:09 +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 119675c970 Keep a copy of the bbox 2013-07-02 12:53:34 +02:00
Clement Jamin 44355c9f11 Rename get_cc_handle => get_cc_iterator 2013-06-27 17:00:00 +02:00
Clement Jamin c8afb5e76a Use of an std::vector instead of a dynamic array 2013-06-27 14:01:52 +02:00
Sébastien Loriot e3bdde7054 remove explicit reference to a header file 2013-06-17 09:52:08 +02:00
Sébastien Loriot c09ec2beaa Merge branch 'Kernel-replace_object-pmoeller' 
Successfully tested in CGAL-4.3-Ic-59
Approved by the release manager

Conflicts:
	Kernel_23/doc/Kernel_23/CGAL/intersections.h
	Kernel_23/doc_tex/Kernel_23_ref/intersection.tex
	Kernel_d/doc/Kernel_d/Kernel_d.txt
	STL_Extension/doc/STL_Extension/CGAL/iterator.h
 2013-06-14 14:26:05 +02:00
Sébastien Loriot 716f87d2d7 rename Hidden_type to unspecified_type and update its description 2013-06-13 18:48:58 +02:00
Sébastien Loriot b30d3daa2b do not use exception in Object::assign. g++3.4 produces a segfault with -O2 2013-06-12 17:39:31 +02:00
Clement Jamin bc360c8b13 Changes for GCC compilation + removed some trailing spaces 2013-06-07 17:40:53 +02:00
Clement Jamin 7abd1181d8 Doc for template parameter 2013-06-06 18:56:57 +02:00
Clement Jamin 0ec9c67920 Minor doc fix 2013-06-06 16:51:57 +02:00
Clement Jamin 0e51e92656 Introduces a new CC_safe_handle class 
Helper class which embed a `Compact_container` (or `Concurrent_compact_container`) iterator and is able to know if the pointee has been erased since the creation of the `CC_safe_handle` instance.
 2013-06-06 16:49:23 +02:00
Clement Jamin 62ba125fea More details in the doc 2013-06-05 17:17:50 +02:00
Sébastien Loriot b8f31dde5b Merge branch 'STL_Extension-add_operator_dispatch_output-local' 
successfully tested in CGAL-4.3-Ic-51
 2013-06-05 16:44:14 +02:00
Sébastien Loriot 0c9656f553 add missing overload of operator= if EDG is defined 2013-06-04 16:53:05 +02:00
Sébastien Loriot 2997e8ae08 Dispatch_(or_drop_)output_iterator<V,O> now accepts a tuple V put in it ... 
...and makes the correct dispatch to the output iterators in O
 2013-05-31 17:20:47 +02:00
Sébastien Loriot 3ffe7cba7e remove tabs 2013-05-31 16:12:15 +02:00