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

926 Commits

Author SHA1 Message Date
Clement Jamin 1946b4fecd Atomics can't be initialized in initializer list 2014-07-08 17:55:55 +02:00
Clement Jamin e5c89d7139 Use atomics for the perturbation timers 
To fix later: the timer are wrong on the parallel version because each threads
counts and adds the CPU time to the total time
 2014-07-08 16:27:25 +02:00
Clement Jamin 01b81c5bcb Fix GCC compilation 2014-07-08 16:17:51 +02:00
Clement Jamin bebed84a3b Forgot to commit the main file 2014-07-08 15:49:48 +02:00
Clement Jamin 078e89f55f Add the possibility to remove the far points 
The far points are added by the parallel version to reduce the contention
on the infinite vertex
 2014-07-08 15:37:59 +02:00
Clement Jamin 0cb9945e58 The far points are now further + minor fixes 2014-07-07 20:56:48 +02:00
Clement Jamin b5a5a82930 Use s_iterator_to 2014-07-07 19:07:46 +02:00
Clement Jamin 4c02082a71 Remove unused variables 2014-07-07 16:36:54 +02:00
Clement Jamin bc4cb0d3f3 Fix data race in verbose mode 2014-07-07 12:03:57 +02:00
Clement Jamin a3db71cc20 Remove warnings 2014-07-04 09:31:27 +02:00
Clement Jamin f19c4b29d8 Fix MSVC warnings 2014-07-03 16:18:48 +02:00
Clement Jamin c641904fad Merge branch 'Mesh_3-parallel-cjamin' of ssh://scm.cgal.org/var/git/cgal into Mesh_3-parallel-cjamin 2014-07-03 16:18:02 +02:00
Clement Jamin 0e4c8e54cd Fix a few other warnings 2014-07-03 15:57:35 +02:00
Clement Jamin da4cf8fc1d Fix gcc warnings (reorder + unused variables & typedef...) 2014-07-03 15:54:39 +02:00
Clement Jamin 0a4267b7ce Temporarily revert "Thread-safe version of incident_cells and incident_facets" 2014-07-03 15:41:02 +02:00
Clement Jamin 5af7535de9 Fix warning (MSVC) 2014-07-03 13:39:11 +02:00
Clement Jamin 8d9fd85f61 Forgot to replace boost::get 2014-07-02 17:16:34 +02:00
Clement Jamin 1be95efcd5 Replace boost::tuple by CGAL::cpp11::tuple 2014-07-02 17:07:54 +02:00
Clement Jamin 982f140911 Use tbb::task_scheduler_init::default_num_threads... 
... instead of boost:🧵:hardware_concurrency
 2014-07-02 15:10:34 +02:00
Clement Jamin a35a5df4ac Add missing #ifdef/#endif 2014-07-02 10:50:30 +02:00
Clement Jamin 9c4d6d6bef Fix compilation with GCC 2014-07-01 16:46:30 +02:00
Clement Jamin a0948a9dac Remove the "domain" parameter of the exuder 
It had been added for the parallel version, but it's not needed anymore
 2014-07-01 11:34:40 +02:00
Clement Jamin e3abf7fc40 Merge branch 'Mesh_3-parallel-cjamin-old' into Mesh_3-parallel-cjamin 2014-07-01 10:38:14 +02:00
Clement Jamin 3abcd888e6 Do not add far points in sequential mode 2014-06-30 19:56:17 +02:00
Clement Jamin b84224d9ec Only add far vertices if the C3T3 is empty 2014-06-25 20:07:09 +02:00
Clement Jamin a09ed46810 Thread-safe version of incident_cells and incident_facets 2014-06-23 10:45:26 +02:00
Clement Jamin 9f5927af61 Move function from C3T3_helpers to TDS 
Move C3T3_helpers::get_incident_cells_without_using_tds_data to TDS::incident_cells_threadsafe
 2014-06-23 08:21:09 +02:00
Clement Jamin a181490bff Fix clang compilation 2014-06-19 17:01:13 +02:00
Clement Jamin 451e6e9cff Missing typename/using/etc. 2014-06-13 13:46:12 +02:00
Clement Jamin 1a8bc68ade Fixed compilation with GCC + removed useless template params 2014-06-12 17:27:14 +02:00
Clement Jamin 6fa129c630 is_XXX_locked + missing lock 2014-06-06 10:32:31 +02:00
Clement Jamin 58f82a58eb Fix Update_facet functor 
It is only used when CGAL_INTRUSIVE_LIST is not defined,
so it hadn't been properly tested.
 2014-06-05 17:15:22 +02:00
Clement Jamin d6693f3319 Replaced some C++11 lambda functions by functors 2014-06-04 16:46:20 +02:00
Clement Jamin 23e1ac17b3 Added "const" to the "move_point_XXX" function family 2014-06-04 16:45:09 +02:00
Clement Jamin 40d597594e Add reset_sliver_cache call in the parallel version 2014-06-04 11:51:56 +02:00
Clement Jamin 7145f7db0b Replaced some C++11 lambda functions by functors +change mutex (static=>member) 2014-06-03 18:18:12 +02:00
Clement Jamin 52e83256ec last_cell_ should be private, not protected 2014-06-03 18:16:38 +02:00
Clement Jamin e176240e31 Replaced some C++11 lambda functions by functors 2014-06-02 12:52:53 +02:00
Clement Jamin a8df04b794 Moved the functor 2014-06-02 10:41:42 +02:00
Clement Jamin de1ae6e608 Replaced C++11 lambda function by functor 2014-05-28 18:57:28 +02:00
Clement Jamin f2ad628aee Replaced C++11 lambda function by functor 2014-05-28 16:29:24 +02:00
Clement Jamin dc808a81cb Replaced C++11 lambda function by functor 2014-05-27 17:21:18 +02:00
Clement Jamin 2f78d27bd3 Code clean-up 2014-05-27 13:21:16 +02:00
Clement Jamin d2f2f9c482 Remove temporary test code 2014-05-27 13:19:45 +02:00
Clement Jamin 0b74b6a8c4 Use s_iterator_to 2014-05-27 13:15:19 +02:00
Clement Jamin cfae6c3bca Remove assertion which is not valid in parallel 2014-05-27 13:14:42 +02:00
Clement Jamin de485dfc10 Use s_iterator_to and remove the constructor I had added temporarily 2014-05-23 17:17:16 +02:00
Clement Jamin d130b32702 Clean-up 2014-05-23 15:48:49 +02:00
Clement Jamin 5b7549f2fd Remove get_ prefix 2014-05-23 15:48:21 +02:00
Clement Jamin 6a2739845b Bugfix: v is needed outside the if block 2014-05-23 15:45:58 +02:00
Clement Jamin ca2a2878b4 Clean-up temporary/debug code 2014-05-23 15:34:27 +02:00
Clement Jamin 5576570846 Clean-up temporary/debug code 2014-05-23 14:42:51 +02:00
Clement Jamin 88a66a5780 Remove get_ prefix 2014-05-22 19:10:50 +02:00
Clement Jamin f2f83135eb Fix previous commit: one #ifdef and one ":" were missing 2014-05-22 18:57:41 +02:00
Clement Jamin 9b2162b2a9 Make Boost.Program_options optionnal 2014-05-22 17:49:44 +02:00
Sébastien Loriot 6dd5949933 remove extra template parameter 2014-05-22 11:25:05 +02:00
Sébastien Loriot 23adab2cd2 add random generator to forwarding constructors 
the two argument version was accidently removed in 1c1b65ae
 2014-05-22 10:55:26 +02:00
Sébastien Loriot 3fa09693a3 Merge branch 'Mesh_3-compare_index-GF-old' into Mesh_3-compare_index-GF 
Conflicts:
	Mesh_3/include/CGAL/Mesh_3/Detect_features_in_polyhedra.h
	Mesh_3/include/CGAL/Mesh_domain_with_polyline_features_3.h
	Mesh_3/include/CGAL/Mesh_polyhedron_3.h
	Mesh_3/test/Mesh_3/test_meshing_polylines_only.cpp
	STL_Extension/include/CGAL/Compact_container.h
	STL_Extension/test/STL_Extension/test_Compact_container.cpp
 2014-05-21 18:24:17 +02:00
Aymeric PELLE 9f11f46077 Merge branch 'Periodic_3_mesh_3-Extended_mesh_3-MBogdanov' 
This small feature adds a new constructor in Labeled_mesh_domain_3 and
a new function wrapper. A Labeled_mesh_domain_3 can be built from an
Iso_cuboid_3 now.
(cf. https://cgal.geometryfactory.com/CGAL/Members/wiki/Features/Small_Features/New_constructor_in_Label_mesh_domain_3_and_new_function_wrapper)
The new wrapper, Implicit_multi_domain_to_labeling_function_wrapper, is a
helping class to get a function with integer values labeling the
components of a multi-domain. This small feature was successfully tested in
the internal release CGAL-4.5-Ic-45.
Approved by the Release Manager.

Conflicts:
	Installation/changes.html
 2014-05-21 18:01:42 +02:00
Sébastien Loriot cbd50574e4 clean up comments, include and copyright 2014-05-21 12:08:12 +02:00
Clement Jamin a942d057fe Better error message 2014-05-20 20:07:16 +02:00
Clement Jamin 27dccd8710 Missing CGAL_ prefix 2014-05-20 19:14:55 +02:00
Aymeric PELLE 566ad109eb Use CGAL macros for indicating deprecated headers. 2014-05-16 13:40:49 +02:00
Clement Jamin 319680fc97 Use unordered_set instead of set 2014-05-15 14:53:41 +02:00
Laurent Rineau 1ec6cd429a Be able to deal with Patch_id=pair<int,int> 
So far, the files
  <CGAL/Mesh_3/Detect_features_in_polyhedra.h>
  <CGAL/Mesh_polyhedron_3.h>
were assuming that the Patch_id was an integral type. Now they assumes
that it is either an integral type, or a pair of integral types.
 2014-05-15 10:57:03 +02:00
Aymeric PELLE 09e56c5bfd Fix some warnings for Windows. 
In the deprecated class Implicit_vector_to_labeled_function_wrapper,
an implicit conversion from an unsigned int to a signed int caused a warning.
On windows, pragma message needs parenthesis.
 2014-05-14 19:42:04 +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 6682dc8781 Remove temporary error message. 2014-05-14 17:26:12 +02:00
Aymeric PELLE 0fd7474b06 Add two pragmas because the warning macro isn't available with all platforms. 2014-05-13 19:47:08 +02:00
Jane Tournois e97506adb7 Merge branch 'Triangulation_3-regular_cell_base_with_circumcenter-GF' 
Resolve conflicts in Mesh_3/include/CGAL/Mesh_3/config.h

This branch implements the small feature described here :
https://cgal.geometryfactory.com/CGAL/Members/wiki/Features/Small_Features/circumcenter%28%29_in_RT3_cell_base

It makes consistent implementations of dual(cell) in RT3 and DT3 :
they both return cell->circumcenter(gt) now

Approved by the release manager
 2014-05-13 14:52:13 +02:00
Laurent Rineau 80ec1ff80b Merge branch 'Mesh_3-fix_Mesh_3_CGAL_4.3-lrineau' 
Fix bugs introduced in CGAL-4.3.

Tested in CGAL-4.5-Ic-35

Approved by the release manager
 2014-05-12 14:42:40 +02:00
Laurent Rineau cd94d98168 Revert "Revert an incorrect push I did" 
This reverts commit 33cb60cc29.
 2014-05-07 15:24:25 +02:00
Laurent Rineau 33cb60cc29 Revert an incorrect push I did 2014-05-07 15:18:53 +02:00
Laurent Rineau bcefbcb8bd Merge remote-tracking branch 'origin/Periodic_3_mesh_3-Extended_mesh_3-MBogdanov' into Periodic_3_mesh_3-Extended_mesh_3-MBogdanov 2014-05-07 13:56:27 +02:00
Laurent Rineau 68c367a2df Revert "Revert "Merge branch 'Periodic_3_mesh_3-Extended_mesh_3-MBogdanov'"" 
This reverts commit 2e58135751.
 2014-05-07 13:56:20 +02:00
Laurent Rineau 57050c3470 Fix another bug introduced in CGAL-4.3 
An assertion was added, but that assertion cannot work if the set of
initial points is collinear (dimension 1).
 2014-05-07 12:05:43 +02:00
Laurent Rineau de44fdf27e Fix a bug introduced in CGAL-4.3 
The Mesh_3 experimental feature "PROTECTION_NON_LINEAR" was not
correctly disabled when the development branch of Mesh_3 was merged into
CGAL-4.3.
 2014-05-07 12:05:43 +02:00
Aymeric PELLE 0264e0a14c Add tests for old versions of Labeled_mesh_domain_3 and Implicit_vector_to_labeled_function_wrapper. 2014-04-29 19:44:09 +02:00
Clement Jamin 9ec6d6c248 Missing #include 2014-04-23 10:41:06 +02:00
Aymeric PELLE d3dc9be69c Adds two compatibilty headers. 
CGAL/Mesh_3/Labeled_mesh_domain_3.h
CGAL/Mesh_3/Implicit_to_labeled_function_wrapper.h

So, some branches in development using theses features won't be broken.
 2014-04-16 20:05:53 +02:00
Aymeric PELLE a12fe7b728 Some classes are moved from the namespace CGAL::Mesh_3 to the namespace CGAL. 
Labeled_mesh_domain_3.
Implicit_to_labeling_function_wrapper.
Implicit_vector_to_labeling_function_wrapper.
Implicit_multi_domain_to_labeling_function_wrapper.
 2014-04-16 19:57:21 +02:00
Laurent Rineau 2e58135751 Revert "Merge branch 'Periodic_3_mesh_3-Extended_mesh_3-MBogdanov'" 
This reverts commit 2ec2fb3c8e, reversing
changes made to 2ed7784521.
 2014-04-16 17:37:04 +02:00
Aymeric PELLE 2ec2fb3c8e Merge branch 'Periodic_3_mesh_3-Extended_mesh_3-MBogdanov' 
- This small feature adds a method to locate point with inexact predicates in
  Periodic_3_triangulation_3.
  (cf. https://cgal.geometryfactory.com/CGAL/Members/wiki/Features/Small_Features/Add_inexact_locate_in_Periodic_3_triangulation_3)
- Tested in CGAL-4.5-Ic-12
- Approved by the Release Manager.
 2014-04-16 16:22:31 +02:00
Laurent Rineau bcdfdf5335 Cleanup trailing spaces 2014-04-16 15:42:46 +02:00
Laurent Rineau aeb1d17cf6 "fix" the test 
It seems that 700 was not a correct lower bound for the number of
protecting balls.
 2014-04-16 14:59:54 +02:00
Laurent Rineau cf3eee72ae Add comments 2014-04-16 12:22:49 +02:00
Clement Jamin e07baefb17 Change the way we compute the exact circumcenter when needed 
In some rare cases, we need to switch to exact computation for the circumcenter.
Some code for this computation is now moved from RT3 to Refine_facets.
 2014-04-15 18:54:12 +02:00
Laurent Rineau 75c61a687d New implementation of Has_timestamp 2014-04-15 18:07:23 +02:00
Laurent Rineau 3c69735dde Fix the deletion of p_rng_ 2014-04-15 18:00:18 +02:00
Jane Tournois 16d8494018 fix the use of namespaces in previous commits 
in particular, fix commit 490a79566f
 2014-04-15 16:24:31 +02:00
Jane Tournois 97b6fc5dcf fix include 2014-04-15 16:20:58 +02:00
Jane Tournois 490a79566f add Has_timestamp partial specialization for primitives in Mesh_polyhedron_3 
they are needed to have determinism since commit
b7b1d297e9
 2014-04-15 15:56:44 +02:00
Jane Tournois b7b1d297e9 fix compilation of Polyhedron demo 
and make use of any Polyhedron possible
(note that if you're not using Mesh_polyhedron_3, then Mesh_3 will not be
deterministic)
 2014-04-15 14:14:38 +02:00
Aymeric PELLE f008c28f7f The implicit wrapper had bad template parameter in test_labeled_mesh_domain_3. 
Fix a warning : explicit conversion for the return value in
Implicit_multi_domain_to_labeling_function_wrapper.
 2014-04-14 18:41:16 +02:00
Laurent Rineau 60016bec63 Remove an extra ';', added by error in previous commits 2014-04-14 14:13:11 +02:00
Laurent Rineau e8134e5f25 Merge branch 'Mesh_3-fix_warnings-lrineau' 
Fix warnings about unused variables/parameters

Use pragmas, when that is needed (for Boost named parameters)

Tested in CGAL-4.5-Ic-7.

Approved by the Release Manager.
 2014-04-11 11:33:11 +02:00
Laurent Rineau cf5d6e041e Use pragmas to fix warnings 2014-04-10 20:06:04 +02:00
Clement Jamin 45ea888972 Missing template parameter 2014-04-08 10:27:05 +02:00
Clement Jamin 6e8625845b Code and comments clean-up 2014-04-08 10:26:00 +02:00
Aymeric PELLE 30e71be043 Labeled_mesh_domain_3.h and Implicit_to_labeling_function_wrapper are moved. 
These files are moved to Mesh_3/include/CGAL/ because they are documented,
so they can be used by users.
 2014-04-07 19:12:30 +02:00