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

1126 Commits

Author SHA1 Message Date
Laurent Rineau b221fd0328 Fix an incoherent indentation 2015-06-17 12:24:01 +02:00
Laurent Rineau 21a699368d Fix a compilation error with gcc44 -std=c++0x 
Should fix issue https://github.com/CGAL/cgal/issues/121

The error was that the "domain" class returns a `CGAL::Point_3<K>`, the
triangulation uses `CGAL::Weighted_point<CGAL::Point_3<K>, double>`, and
one piece of code from Mesh_3 in <CGAL/Mesh_3/Refine_facets_3.h> uses an
implicit conversion from

    tuple<something_A, something_B, CGAL::Point_3<K> >
to

    tuple<something_A, something_B, CGAL::Weighted_point<P, double> >

and plugs that into a `boost::optional`. For some reason, the g++-4.4
compiler does not like that, but recent g++ compilers accept the code.

The fix is to use an explicit conversion from `Point_3` to
`Weighted_point<Point_3, double>`.
 2015-06-17 12:21:15 +02:00
Simon 7bb2046372 This should solve issue #41. 
(cherry picked from commit bc125c525c)
 2015-06-17 12:07:51 +02:00
Simon 195f11a98f Explicitely call the constructor of Surface_patch to prevent compilation failures with g++. 
(cherry picked from commit f9e4a9faff)
 2015-06-17 12:04:13 +02:00
Laurent Rineau 40c629a3b4 Merge pull request #90 from janetournois/Mesh_2-add_optimizers-GF 
Add optimizer methods in Mesh_2

https://cgal.geometryfactory.com/CGAL/Members/wiki/Features/Small_Features/lloyd_optimize_mesh_2
 2015-06-10 11:57:53 +02:00
Sébastien Loriot ce8806b19b Merge remote-tracking branch 'cgal-dev/CGAL-Qt_no_keywords-GF' into Mesh_2-add_optimizers-GF 
Conflicts:
	GraphicsView/demo/Triangulation_2/Constrained_Delaunay_triangulation_2.cpp
 2015-05-19 09:07:08 +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
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
Laurent Rineau 617c8de2c6 Merge pull request #51 from SLopezBRGM/master 
simple fixes to use generic indexes for subdomains and surfacepatches
 2015-05-18 11:03:51 +02:00
Simon 067647eebf Replacing the use of operator!= by !( operator== ) when comparing domain or surface indexes. 
This is link to issue #37.
 2015-04-16 10:12:50 +02:00
Simon bc125c525c This should solve issue #41. 2015-04-14 21:31:18 +02:00
Philipp Möller 49a56c5a79 Fine grained range includes 2015-04-13 17:26:36 +02:00
Philipp Möller 74e71f41e2 Remove uses of Boost.Lambda 
Replace Boost.Lambda with simple loops. The library is not maintained
and no one is going to ever invest in it again. It adds to compile and
preprocessing times without providing safer or shorter code and we can
sacrifice a little bit of readability.
 2015-04-13 17:24:08 +02:00
Philipp Möller 4f8e76b074 Boost.Lambda is not used here anymore 2015-04-13 16:47:00 +02:00
Simon f9e4a9faff Explicitely call the constructor of Surface_patch to prevent compilation failures with g++. 2015-04-12 22:27:44 +02:00
Jane Tournois 6de112e4a3 move internal folder to subfolder of Polygon_mesh_processing 2015-03-16 10:04:56 +01:00
Sébastien Loriot 13296e6887 Merge branch 'old/Polygon_mesh_processing-GF' into Polygon_mesh_processing-GF 2015-02-16 11:48:29 +01:00
Sébastien Loriot 607929b069 Merge remote-tracking branch 'origin/releases/CGAL-4.5-branch' 
Conflicts:
	Installation/changes.html
	Maintenance/release_building/public_release_name
	Mesh_3/include/CGAL/Mesh_3/C3T3_helpers.h
 2015-02-16 11:45:08 +01:00
Jane Tournois 0d1087857a int -> size_t + cherrypick 2015-02-12 17:17:28 +01:00
Jane Tournois f4af27a3da reorder variables for initialization 2015-02-06 10:01:41 +01:00
Sébastien Loriot 39f9813070 add discover_connected_component 2015-02-05 14:04:43 +01:00
Jane Tournois abfc6d92c8 fix a warning caused by boost::dynamic_bitset<> 2015-02-03 11:20:01 +01:00
Jane Tournois 21082320e3 minimize changes to get warnings, but dynamic_bitset triggers a warning 2015-02-03 11:05:29 +01:00
Jane Tournois a923ae477d fix conversion warnings. meshing_info() is an int here 2015-02-03 10:25:43 +01:00
Jane Tournois b03a656246 this becomes useless because we now backup infinite cells 2015-02-02 15:55:28 +01:00
Jane Tournois c57b9b8840 backup infinite cells for revert_move of perturber 
this is necessary because there can be an infinite cells
among the outdated_cells (with a finite facet f)
that does not share any finite facet with the other cells of
the conflict zone/set of outdated cells.

Therefore the surface info of f cannot be

Conflicts:
	Mesh_3/include/CGAL/Mesh_3/C3T3_helpers.h
 2015-02-02 15:54:34 +01:00
Laurent Rineau 434766c22b Merge branch 'releases/CGAL-4.5-branch' 
Approved by the Release Manager.
 2015-01-30 11:30:49 +01:00
Laurent Rineau 72e0a3e677 Fix warnings about signed/unsigned 
The code involved is about TBB.
 2015-01-21 12:59:07 +01:00
Laurent Rineau 602383e15b Merge branch 'Mesh_3-fix_Implicit_mesh_domain_3_default_bound-lrineau' 
Bug fix in Mesh_3

Approved by the Release Manager. Tested in CGAL-4.6-Ic-79.
 2014-12-17 17:09:20 +01:00
Laurent Rineau 057924e1d4 Merge remote-tracking branch 'origin/releases/CGAL-4.5-branch' 
That merges the following:
  | commit 5dbfeec3ae
  | Merge: fc407cf 5b9be0f
  | Author: Sébastien Loriot <sebastien.loriot@cgal.org>
  | Date:   Fri Dec 12 15:29:51 2014 +0100
  |
  |     Merge branch 'BSO_2-fix_kernel_conflict-local' into releases/CGAL-4.5-branch
  |
  |     Tested in CGAL-4.5.1-Ic-171
  |
  | commit fc407cfebf
  | Merge: bd2c6f8 0c6153c
  | Author: Laurent Rineau <laurent.rineau@cgal.org>
  | Date:   Mon Dec 1 17:38:48 2014 +0100
  |
  |     Merge branch 'Mesh_3-fix_with_time_stamps-GF' into releases/CGAL-4.5-branch
  |
  |     Bug-fix in Mesh_3 with time stamps.
  |
  |     Tested in CGAL-4.5.1-Ic-168.
  |     Approved by the Release Manager.
  |
  | commit bd2c6f890f
  | Merge: ad53e42 c904f77
  | Author: Laurent Rineau <laurent.rineau@cgal.org>
  | Date:   Fri Nov 28 12:04:55 2014 +0100
  |
  |     Merge branch BGL-make_property_map_lightweight-For_4.5_bugfix-GF' into releases/CGAL-4.5-branch
  |
  |     Bug fix: a property map was not lightweight.
  |
  |     Tested in CGAL-4.5.1-Ic-167.
  |     Approved by the Release Manager.
  |
  | commit ad53e42fb3
  | Merge: 044660e b281d86
  | Author: Laurent Rineau <laurent.rineau@cgal.org>
  | Date:   Fri Nov 28 12:03:30 2014 +0100
  |
  |     Merge remote-tracking branch 'remotes/origin/BGL-fix_example-GF' into releases/CGAL-4.5-branch
  |
  |     Fix the example examples/BGL_triangulation_2/emst.cpp:
  |     the filtered (finite) triangulation was not used.
  |
  |     Tested in CGAL-4.5.1-Ic-167.
  |     Approved by the Release Manager.
  |
  | commit 044660eb48
  | Merge: a096cdf 4464116
  | Author: Laurent Rineau <laurent.rineau@cgal.org>
  | Date:   Fri Nov 28 12:01:50 2014 +0100
  |
  |     Merge branch 'CGAL-fix_sse2_mingw-lrineau' into releases/CGAL-4.5-branch
  |
  |     Fix the SSE macros when MinGW is used.
  |
  |     Tested in CGAL-4.5.1-Ic-167.
  |     Approved by the Release Manager.

Tested in CGAL-4.6-Ic-79.
 2014-12-17 17:05:01 +01:00
Laurent Rineau 21161cc432 The default error_bound for Implicit_mesh_domain_3 was too small 2014-11-28 12:16:14 +01:00
Jane Tournois 78ccd1440f Merge branch 'Mesh_3-fix_integer_overflow-jtournoi' 
this branch fixes Image_IO for large images, when the
dimensions do not fit in 'unsigned int'
'size_t' is now used everywhere that deals with image sizes
and pixel/voxel coordinates

fix suggested by a CGAL user
 2014-11-27 12:15:40 +01:00
Laurent Rineau 0c6153ce8c cleanup 
I forgot to remove extra expensive assertions that I have used using the
debugging!

I clean up also a few spaces at end of lines.
 2014-11-27 11:29:52 +01:00
Laurent Rineau 4bdafe6908 Bug-fix in Mesh_3 with time stamps 
That is a follow-up to that commit:
  | commit eefe2012c0
  | Author: Laurent Rineau <laurent.rineau@cgal.org>
  | Date:   Thu Oct 2 16:59:19 2014 +0200
  |
  |     Bug-fix in Mesh_3 with time stamps
  |
  |     The implementation of the class template Protect_edges_sizing_field was
  |     not correct when time stamps are used for Vertex_handle. The issue is
  |     that the time stamp of a vertex change when one do:
  |       tr.remove(v);
  |       v = tr.insert(point);
  |     The vertex pointed by 'v' is re-used by the TDS, but the time stamp of
  |     the vertex does change.
  |
The fix was not complete.
 2014-11-26 15:56:37 +01:00
Jane Tournois f59acabc9b avoid using info when casting 2014-11-07 11:19:20 +01:00
Laurent Rineau 2d72cd7f7e Merge branch 'Mesh_3-fix_includes-lrineau' 
Fix missing/surperflous #include

Tested in CGAL-4.6-Ic-50.
Approved by the Release Manager.
 2014-11-06 11:59:26 +01:00
Laurent Rineau 768ec1d687 Merge branch 'Polyhedron_demo-fix_warning-lrineau' 
Fix warnings in the Polyhedron demo. The fixes are in Mesh_3,
Min_sphere_or_spheres_d, and in the Polyhedron demo itself.

Tested in CGAL-4.6-Ic-50.
Approved by the Release Manager.
 2014-11-06 11:58:09 +01:00
Laurent Rineau 7d63f9d072 Merge branch 'releases/CGAL-4.5-branch' 
Conflicts:
	Installation/changes.html
	Maintenance/release_building/public_release_name
 2014-11-06 10:47:45 +01:00
Laurent Rineau e50820d3fd Fix #include in Mesh_3 
There was missing #include, and surperfuous #include (hard to detect).
 2014-11-05 17:01:28 +01:00
Laurent Rineau 4a8d9077c0 Fix a warning 
Warning from clang:

Mesh_3/include/CGAL/Mesh_3/C3T3_helpers.h:1358:25: warning: comparison of unsigned expression >= 0 is always true [-Wtautological-compare]
 2014-11-03 16:52:51 +01:00
Jane Tournois 42abb4db5a fix a warning 2014-10-24 14:24:29 +02:00
Laurent Rineau 908d608072 Merge branch 'releases/CGAL-4.5-branch' 
Conflicts:
	Installation/changes.html
 2014-10-20 14:46:36 +02:00
Jane Tournois 06eb921215 fix the use of integers 
patch suggested by Bryn Lloyd on cgal-discuss to avoid an integer overflow
problem that occurs when generating a 3D mesh from very large images
 2014-10-20 12:39:03 +02:00
Laurent Rineau 47708fd7e5 Fix a warning 2014-10-17 16:34:08 +02:00
Jane Tournois 2ff8f82bf2 improve the sorting function 2014-10-17 16:34:08 +02:00
Jane Tournois d9cb114484 get_umbrella fixed. It was responsible for holes on the output mesh surface 
it collects edges incident to the internal facets of the conflict zone,
that are restricted to the surface.
For each such edge :
- if it appears once, we keep it
- if it appears twice, we don't consider it
- if it appears more than twice, we are in a non-manifold configuration,
and the move (pump) is canceled
 2014-10-17 16:34:08 +02:00
Laurent Rineau 86ae58ef9f Merge branch 'Mesh_3-fix_surface_holes_4.5-jtournoi' into releases/CGAL-4.5-branch 2014-10-09 16:33:34 +02:00
Clement Jamin 201ab5f9be We need to copy facet's surface center too 
(cherry picked from commit 32f7f5fd610481512ee626df4fd08249a31a8938)
 2014-10-08 10:51:55 +02:00
Laurent Rineau 90f02e7c73 Merge branch 'Mesh_3-fix_with_time_stamps-GF' into releases/CGAL-4.5-branch 
Fix a bug in Mesh_3, when timestamps are used to compare Vertex_handle
and Cell_handle. The bug was in the class
Protect_edges_sizing_field. Once a vertex is removed from a
triangulation, the timestamp of the Vertex can change. That means that
it invalidates any future use of the original Vertex_handle.

Bug-fix for CGAL-4.5, approved by the Release Manager.
 2014-10-06 12:41:31 +02:00
Laurent Rineau 9e586da1e6 Revert two commits. 
Revert "Add longer tests, with other data"
Revert "Verbose testsuite. Should be reverted later."

This reverts commit 0f592d8e0a.
This reverts commit a8e6764c97.
 2014-10-03 17:13:49 +02:00
Laurent Rineau a8e6764c97 Add longer tests, with other data 
So far, that shows bugs.
 2014-10-03 16:39:04 +02:00
Laurent Rineau 798db08a11 Make sure the functor is Assignable 
A boost::function_output_iterator requires that its template argument is
Assignable. See:
http://www.boost.org/doc/libs/1_56_0/libs/iterator/doc/function_output_iterator.html#function-output-iterator-requirements
If one stores a non-const reference, then the class is not
Assignable. Store a pointer instead.
 2014-10-03 16:26:43 +02:00
Laurent Rineau 99462e7faa Fix missing header 2014-10-03 16:26:33 +02:00
Laurent Rineau eefe2012c0 Bug-fix in Mesh_3 with time stamps 
The implementation of the class template Protect_edges_sizing_field was
not correct when time stamps are used for Vertex_handle. The issue is
that the time stamp of a vertex change when one do:
  tr.remove(v);
  v = tr.insert(point);
The vertex pointed by 'v' is re-used by the TDS, but the time stamp of
the vertex does change.
 2014-10-02 17:04:51 +02:00
Jane Tournois 354959972c bug fix in restoration of Cell data after revert_move 
we still don't backup infinite cells because the infinite vertex does not have
a proper vertex ID (i.e. meshing_info())
However the facet data should be restored in Delaunay-restricted facets that
belong to an infinite cell (i.e. mirror facets of restricted facets that
belong to the convex hull)
 2014-09-30 16:51:34 +02:00
Sébastien Loriot 3616d28c86 typedef instead of using 2014-09-25 14:10:38 +02:00
Sébastien Loriot 024bd2724f add output_facets_in_complex_to_off and update test and demo 2014-09-24 12:05:02 +02:00
Sébastien Loriot 684104c032 add 2 overloads of output_boundary_of_c3t3_to_off in the C3T3 class 
also update the demo plugin to use one of them
 2014-09-24 08:26:18 +02:00
Sébastien Loriot e4e65dceda import file to write the surface of a subdomain into a file 
use it in the demo, with writting in a .off for now
 2014-09-24 08:26:18 +02:00
Laurent Rineau 36d8b5bd18 Convert source files encoding to utf-8 
All non-ASCII files should be encoded in UTF-8. So far, the ZSH script
`Scripts/developer_scripts/detect_wrong_encoding` detects wrong encoding
in source/header files of include/, src/, and doc/.
 2014-08-01 11:20:13 +02:00
Clement Jamin e4a1efc3e8 Fix "unused variable" warnings 2014-07-24 11:46:08 +02:00
Laurent Rineau 7c29e97263 Fix a segfault 
There was a bug when a Polyhedral_mesh_domain_with_features_3 was
constructed with the default `Random* = 0`.
 2014-07-18 16:35:43 +02:00
Laurent Rineau 3deb8e7910 Merge branch 'Mesh_3-compare_index-GF-old' into Mesh_3-compare_index-GF 
Create an integration branch for 'Mesh_3-compare_index-GF': a new branch
created from 'master', where I merged the previous version of
'Mesh_3-compare_index-GF'.

There was a conflict with two features recently merged into 'master' for
CGAL-4.5:

- the move of two files from include/CGAL/Mesh_3/ to include/CGAL/. See
  the small feature:
    http://cgal.org/wiki/Features/Small_Features/New_constructor_in_Label_mesh_domain_3_and_new_function_wrapper

- parallelism for Triangulation_3 and Mesh_3:
    http://cgal.org/wiki/Features/Parallel_Mesh_3

Conflicts:
	Combinatorial_map/include/CGAL/Cell_attribute.h
	Mesh_3/include/CGAL/Implicit_mesh_domain_3.h
	Mesh_3/include/CGAL/Labeled_image_mesh_domain_3.h
	Mesh_3/include/CGAL/Mesh_3/Sliver_perturber.h
	Mesh_3/include/CGAL/Polyhedral_mesh_domain_3.h
	Mesh_3/test/Mesh_3/test_meshing_3D_image.cpp
	Mesh_3/test/Mesh_3/test_meshing_polyhedron.cpp
	Mesh_3/test/Mesh_3/test_meshing_polyhedron_with_features.cpp
	Polyhedron/demo/Polyhedron/Polyhedron_type.h
	STL_Extension/include/CGAL/Compact_container.h
	STL_Extension/test/STL_Extension/test_Compact_container.cpp

I also modified the following files during the conflict resolution:

	Linear_cell_complex/include/CGAL/Cell_attribute_with_point.h
	Mesh_3/include/CGAL/Labeled_mesh_domain_3.h
	Mesh_3/include/CGAL/Polyhedral_mesh_domain_with_features_3.h
 2014-07-18 15:47:14 +02:00
Laurent Rineau d0570871e7 Fix a warning 2014-07-16 17:06:11 +02:00
Clement Jamin deb6edcb1f Wrong variable name. 2014-07-16 17:05:22 +02:00
Clement Jamin dad9162352 Missing "using" 2014-07-16 17:04:47 +02:00
Clement Jamin 2dd27c4d13 Fix a (minor) data race on the circumcenter cache 2014-07-16 16:35:31 +02:00
Clement Jamin 6f7587c6dd Fix small differences between master and Mesh_3-parallel 2014-07-16 14:13:40 +02:00
Clement Jamin aa1aa597bb Restore commit a09ed468 with a bug fix 
"Thread-safe version of incident_cells and incident_facets"
 2014-07-15 20:13:30 +02:00
Clement Jamin db6db80096 Fix identation 2014-07-15 18:11:31 +02:00
Laurent Rineau 64fe2b3f8e Remove warnings 2014-07-10 14:46:12 +02:00
Laurent Rineau 19158bac27 Remove warnings about unused parameters 2014-07-10 14:41:42 +02:00
Andreas Fabri b63488b0e9 remove unused parameters 2014-07-09 16:15:54 +02:00
Andreas Fabri 3aefde776a Move a function body in the class definition to avoid an ICE with VC12 2014-07-09 15:30:16 +02:00
Clement Jamin 39b2b6379b Forgot an #ifdef 2014-07-08 20:47:37 +02:00
Clement Jamin 93fc2bfdfc Bug fix (ref to a temporary object) 2014-07-08 20:19:51 +02:00
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
Aymeric PELLE 477f0a4ac1 Add a test for Implicit_multi_domain_to_labeling_function_wrapper. 
Fix a bug with the constructor taking one parameter only.
 2014-04-01 16:30:32 +02:00
Aymeric PELLE 0e9e80b872 Point type is deduced from the ImplicitFunction in the new wrapper. 
In Implicit_multi_domain_to_labeling_function_wrapper, the point
type is deduced if ImplicitFunction is a pointer function, else it must
be a nested type of ImplicitFunction.
BGT isn't required anymore for this wrapper.
The constructor of Implicit_multi_domain_to_labeling_function_wrapper taking
only one argument has a new way for auto-making the vector of vector of
positions. In this case, the union of the components equals to the union
of the functions.
 2014-03-31 18:42:47 +02:00
Laurent Rineau 6649036c80 Fix a bug in Mesh_3 
Benjamin Kehlet reported on CGAL-discuss (Tue, 25 Mar 2014 13:45:24
+0100) that Mesh_3 was not able to mesh the simple following OFF:

OFF
4 4 0

0 0 0
0 0 1
0 1 0
1 0 0
3  3 1 2
3  0 1 3
3  0 3 2
3  0 2 1

The unit tetrahedron!!

The bug was in the robust weighted circumcenter traits. The traits
checks that the circumcenter of four points is at least in the circum
sphere of the four points. But for weighted points, that is
"power_test" that must be tested, instead of "side_of_oriented_sphere".
 2014-03-31 15:44:59 +02:00
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
Jane Tournois 673d1f03cd Merge branch 'Mesh_3-fix_set_facet_surface_center-jtournois' 
This branch fixes a potential bug, that the facet surface center
is sometimes not updated properly in mirror_facet(f) when it is in f.

Tested in testsuite CGAL-4.4-Ic-155

Approved by the release manager
 2014-03-27 11:16:36 +01:00
Aymeric PELLE c15ff1c19c New implementation of Implicit_multi_domain_to_labeling_function_wrapper. 
The user can indicate more precisely which components he wants.
For each component that the user want, he must provide the matching
vector of signs. All these vector of positions must be put in a vector
passed as second parameter to the constructor of that wrapper.
Doc and examples are updated.
 2014-03-26 19:02:27 +01:00
Jane Tournois 533fa556d6 reorder parameters to keep old code valid (error_bound is documented) 2014-03-25 18:21:11 +01:00
Jane Tournois 215b463812 use CGAL::Random* as member variable 
it avoids using temporary CGAL::Random(0) that would be deleted
as soon as we get out of the constructor

+ make examples deterministic and tests not (all but test_meshing_determinism)
 2014-03-25 17:47:15 +01:00
Aymeric PELLE 31767a8411 Rename ..._labeled_function_wrapper to ..._labeling_function_wrapper. 
Implicit_vector_to_labeled_function_wrapper is deprecated.
Examples, tests, docs are updated.
 2014-03-25 15:25:42 +01:00
Jane Tournois 98e8e85364 remove wrong 'const' 2014-03-25 15:16:02 +01:00
Jane Tournois 6521f8d474 Revert "replace CGAL::Random& by mutable CGAL::Random for member variable type" 
This reverts commit 1c1b65ae39.
The random generator member variable should be a CGAL::Random&, as in generators.h and
in the STL.

Also fix two constructors
 2014-03-25 12:43:53 +01:00
Jane Tournois 1c1b65ae39 replace CGAL::Random& by mutable CGAL::Random for member variable type 
and make use of const everywhere else
 2014-03-25 11:39:12 +01:00
Jane Tournois 6792a899de fix compilation of Polyhedral_mesh_domain_with_features_3 
when a random generator which does not have the default value is chosen
 2014-03-24 17:25:10 +01:00
Jane Tournois 6566c592c2 remove new template parameter RNG 
using CGAL::Random everywhere is simpler and definitely enough
note we are using CGAL::Random& as in Random_generator_base
(see CGAL/generators.h)
 2014-03-24 12:50:18 +01:00
Jane Tournois 61c245e0ea add a random number generator (RNG) template parameter to mesh domains 
a default value (CGAL::Random(0)) is given to avoid non-determinism
 2014-03-21 10:35:01 +01:00
Andreas Fabri 5c5aa5d702 Workaround for an ICE with VC12 
The return type optional<tuple...> leads to the crash
One workaround had been to move the body of the function
into the class.
As the function is private I instead return through a reference instead.
 2014-03-21 10:27:59 +01:00
Andreas Fabri e4b2e1997e Workaround for VC12' new (and not yet well understood) problem with 'using' 2014-03-21 10:26:51 +01:00
Andreas Fabri b80f5f6ef4 Move the default constructor in the section with hand written variadic templates 2014-03-21 10:24:27 +01:00
Aymeric PELLE 0d1f136b85 New constructor for Implicit_multi_domain_to_labeled_function_wrapper. 
This new constructor takes only one parameter : a vector of functions.
The mask will be automatically built with positive signs.
 2014-03-20 16:18:18 +01:00
Jane Tournois ea1c29e9d3 bug fix : set_facet_surface_center needs to be done in mirror_facet too 2014-03-20 10:16:22 +01:00
Jane Tournois 9f67ee99c7 Revert "sort facets and tetrahedra with indices, to get always the same file for the same mesh" 
This reverts commit 2ab45a8514.
It is not needed anymore because cells and vertices come in deterministic order
 2014-03-18 16:45:23 +01:00
Jane Tournois 1fd86adab6 remove useless include 2014-03-18 15:37:47 +01:00
Jane Tournois 8e3bef2e87 remove useless sort (and useless diff with master) 2014-03-18 15:32:05 +01:00