Commit Graph

937 Commits

Author SHA1 Message Date
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
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
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