c3de61a1d9
Use <boost/noncopyable.hpp> instead of our home-made solution
2018-05-15 14:56:22 +02:00
87066b93a1
Rename a function for readability
2018-05-15 14:56:22 +02:00
a2a5c6ed6a
Cleaning of impl. details in <CGAL/Mesh_3/Image_to_labeled_function_wrapper.h>
...
Now that wrapper class:
- uses `std::function`,
- is not longer templated by the kernel,
- or by the image type.
2018-05-15 14:56:22 +02:00
0d839ce60a
Correct usage of Boost Parameters
2018-05-15 14:56:21 +02:00
8b25761094
Add a constructor using Boost Parameters
2018-05-15 14:56:21 +02:00
0400eb6c4b
Cleanup included header for Boost Parameters
2018-05-15 14:56:21 +02:00
fd1a788851
Replace Default by the real type default
2018-05-15 14:56:21 +02:00
85d9e02cc3
Call iso_cuboid in the Impl_details base class
2018-05-15 14:56:21 +02:00
91b6dc3b13
Add Construct_surface_patch_index to the Impl_details
2018-05-15 14:56:21 +02:00
7e9165d78a
WIP: Change the template parameters of Labeled_image_mesh_domain_3 (TODO)
...
TODO: document the changes, once that is over.
2018-05-15 14:56:21 +02:00
cbcad49920
Use CGAL::cpp11::function to store functors
...
and at the same time the constructors logic is factorized in the
constructor of a base class.
2018-05-15 14:56:21 +02:00
1a3c4436ae
WIP: allow to change the Surface_patch_index type
2018-05-15 14:56:21 +02:00
79829ffb99
Move Index_generator to another header
2018-05-15 14:56:21 +02:00
c751c1fc39
Rename the file
2018-05-15 14:56:21 +02:00
9655043e69
Add debug instructions
2018-05-15 14:56:21 +02:00
c19c84a022
Fix a line of code that was never tested
2018-05-15 14:56:21 +02:00
2a66790614
Fix a bug
...
and add assertions. The assertions use lambda expression to display useful
information.
2018-05-15 14:56:21 +02:00
569b823cd5
Protection of triple lines of the bbox for scalar images
...
Now that work. I have to work a bit on the precision of the approximation.
2018-05-15 14:56:20 +02:00
1d5e9e9150
WIP: implementation for scalar image
...
... tested only on segmented images!
2018-05-15 14:56:20 +02:00
c238d7822d
Moved functions's bodies
2018-05-03 14:52:52 +02:00
d629406451
Fixed bad auto merge
2018-05-03 14:22:26 +02:00
7630458123
Added some safety nets on find() calls
2018-05-03 14:22:07 +02:00
eda93364be
Made register_corner() public (but undocumented)
2018-05-03 14:19:23 +02:00
1f9655f935
Add 'add_corner_with_context'
2018-05-03 12:53:30 +02:00
f2171b799e
Get rid of 'corners_incidence_map_'
...
'corners_incidence_map_' was a map<point, surface_patch_index>.
'corners_indidences_' is a map<Corner_index, surface_patch_index>.
The first map was only used in Lipschitz_sizing, at a place where
we are given a point and a MeshDomain::Index.
The first map was filled in 'insert_edge()', which calls
'compute_corners_incidences()' (which fills 'corners_incidences').
Thus, we can simply grab the Corner_index and use the second map
immediately.
2018-05-03 12:52:06 +02:00
e1ffe36e7c
Added 'add_corner(s)'
...
Allows to add 0-dimensional features which are not necessarily incident to
a 1-dimensional feature.
2018-05-03 12:51:39 +02:00
18c68c3047
Add 'add_corner_with_context'
...
and change the return type of 'register_corner()' to return the Corner_index
(no used, but just for symmetry)
2018-04-27 16:15:44 +02:00
93a9a417a6
Get rid of 'corners_incidence_map_'
...
'corners_incidence_map_' was a map<point, surface_patch_index>.
'corners_indidences_' is a map<Corner_index, surface_patch_index>.
The first map was only used in Lipschitz_sizing, at a place where
we are given a point and a MeshDomain::Index.
The first map was filled in 'insert_edge()', which calls
'compute_corners_incidences()' (which fills 'corners_incidences').
Thus, we can simply grab the Corner_index and use the second map
immediately.
2018-04-27 16:08:27 +02:00
e8888239e1
Fixed using deprecated code
2018-04-27 14:09:57 +02:00
a0427ec756
Fixed abusing Triangulation_cell_base_3 for Delaunay triangulations
...
TriangulationCellBase_3 does not request a circumcenter;
DelaunayTriangulationCellBase_3 does.
Delaunay_triangulation_3 only compiled because
Triangulation_cell_base_3 (and Triangulation_ds_cell_base_3 !)
provided circumcenter() operators and DT3 inherited T3's TDS.
- The circumcenter() functions are removed where they shouldn't exist
- DT3 uses DT_cell_base_3 as cell base instead of T_cell_base_3
- Concepts/Classes that supposedly only required TriangulationCellBase_3
and then built Delaunay triangulations with that (Alpha Shapes, etc.)
are upgraded to request DelaunayTriangulationCellBase_3 (anyway, it
wouldn't compile if you actually provided a model of
TriangulationCellBase_3)
- Fixed various wrong templates in classes/concepts such as
MeshVertexBase_3 not refining RegularTriangulationVertexBase_3
and (only in the doc) defaulting to Triangulation_vertex_base_3
- Removed the deprecated class (for 4+ years) T_cell_base_with_circumcenter
2018-04-26 13:21:53 +02:00
17d46e9211
Merge branch 'Periodic_3_mesh_3-Feature-MBogdanov-old' into Periodic_3_mesh_3-Feature-MBogdanov
2018-04-26 11:55:17 +02:00
c54a6a4980
Put CGAL::random_shuffle() in the subnamespace cpp98
2018-04-11 09:32:23 +01:00
063a91a771
Use CGAL::random_shuffle
2018-04-04 14:00:23 +01:00
237735ab73
Merge pull request #2946 from afabri/CGAL-dependencies-GF
...
Move properties from Mesh_3 to BGL, Polyhedron_3 and Surface_mesh
2018-03-27 10:35:23 +02:00
cd6fe20bd4
Merge branch 'releases/CGAL-4.11-branch'
2018-03-26 11:03:37 +02:00
3c70f8bad0
Fix dependencies by moving files
2018-03-23 14:17:24 +01:00
b9f4a4e06b
implement number_of_corners(), that is documented
2018-03-23 11:54:53 +01:00
c504ea3e9f
Fixes
...
- cleanup
- be careful not to add things to the documentation
2018-03-22 17:23:28 +01:00
8c41669fb7
move properties from Mesh_3 to BGL, Polyhedron_3 and Surface_mesh
2018-03-22 16:37:37 +01:00
8646350d47
Merge branch 'Periodic_3_mesh_3-Feature-MBogdanov-old' into Periodic_3_mesh_3-Feature-MBogdanov
2018-03-15 14:42:21 +01:00
5d1cd90517
Add two typename
2018-03-05 14:17:26 +00:00
da744ba852
Fix a warning
...
```
[ 50%] Building CXX object CMakeFiles/generic_random_test.dir/generic_random_test.cpp.o
/usr/local/bin/c++ -DCGAL_TEST_SUITE=1 -DCGAL_USE_GMP -DCGAL_USE_MPFR -I/home/cgal_tester/build/src/cmake/platforms/Ubuntu-latest-GCC6-CXX1z/test/Generator/../../include -isystem /usr/include/x86_64-linux-gnu -I/home/cgal_tester/build/src/cmake/platforms/Ubuntu-latest-GCC6-CXX1z/test/Generator -I/home/cgal_tester/build/src/cmake/platforms/Ubuntu-latest-GCC6-CXX1z/include -I/mnt/testsuite/include -DDONT_USE_BOOST_PROGRAM_OPTIONS -Wall -Wextra -std=c++1z -frounding-math -Wall -frounding-math -o CMakeFiles/generic_random_test.dir/generic_random_test.cpp.o -c /home/cgal_tester/build/src/cmake/platforms/Ubuntu-latest-GCC6-CXX1z/test/Generator/generic_random_test.cpp
In file included from /mnt/testsuite/include/CGAL/Mesh_3/vertex_perturbation.h:35,
from /mnt/testsuite/include/CGAL/Mesh_3/Sliver_perturber.h:48,
from /mnt/testsuite/include/CGAL/perturb_mesh_3.h:35,
from /mnt/testsuite/include/CGAL/optimize_mesh_3.h:32,
from /mnt/testsuite/include/CGAL/refine_mesh_3.h:39,
from /mnt/testsuite/include/CGAL/make_mesh_3.h:35,
from /home/cgal_tester/build/src/cmake/platforms/Ubuntu-latest-GCC6-CXX1z/test/Generator/generic_random_test.cpp:9:
/mnt/testsuite/include/CGAL/Mesh_3/C3T3_helpers.h: In member function 'void CGAL::Mesh_3::C3T3_helpers<C3T3, MeshDomain>::Cell_data_backup::backup_finite_cell(const Cell_handle&)':
/mnt/testsuite/include/CGAL/Mesh_3/C3T3_helpers.h:1431:48: warning: type qualifiers ignored on cast result type [-Wignored-qualifiers]
const int ii = static_cast<const int>(i);//avoid warnings
^
```
https://cgal.geometryfactory.com/CGAL/testsuite/CGAL-4.12-Ic-186/Generator/TestReport_lrineau_Ubuntu-latest-GCC6-CXX1z.gz
2018-02-28 13:45:03 +00:00
d9168d011c
Merge branch 'Periodic_3_mesh_3-Feature-MBogdanov-old' into Periodic_3_mesh_3-Feature-MBogdanov
2018-02-23 18:24:39 +01:00
c28e05be0c
Merge branch 'Periodic_3_mesh_3-Feature-MBogdanov-old' into Periodic_3_mesh_3-Feature-MBogdanov
2018-02-23 12:50:06 +01:00
78e7060525
Merge pull request #2712 from afabri/CGAL-VC+warnlevel_4-GF
...
Deal with VC++ warnings of level /W4
2018-02-19 14:27:06 +01:00
c3ad015f51
Merge pull request #2823 from afabri/Mesh_3-undocumented_function_for_FEniCS-GF
...
Mesh_3: Add access function to the stored polyhedra
2018-02-19 14:26:40 +01:00
9d227d0fba
Merge pull request #2758 from maxGimeno/BGL-Document_graph_has_property-GF
...
BGL: Document graph_has_property
2018-02-19 14:26:33 +01:00
07b0ddf9a5
Fix disable/enable warnings; Fix indentation
2018-02-13 14:15:38 +00:00
483f69728e
Refresh branch
2018-02-12 22:21:38 +01:00
39526dd16f
Mesh_3: Add access function to the stored polyhedra for the FeniCS project
2018-02-12 16:00:14 +00:00
66b19d9cb5
Merge pull request #2779 from lrineau/Mesh_3-fix_bugs-GF
...
Mesh_3: fix bugs in undocumented code
2018-02-02 16:07:53 +01:00
f310fc588d
Merge pull request #2690 from sgiraudot/Classification-ETHZ_random_forest-GF
...
Classification: ETHZ Random Forest
2018-02-01 17:35:30 +01:00
f2bc9d6b62
Fix merge_duplicated_points
...
`Union_find` is required to merge correct patch ids.
2018-02-01 17:07:35 +01:00
50865f38e8
Fix a compilation error with CGAL_MESH_3_PROTECTION_HIGH_VERBOSITY
2018-02-01 17:07:12 +01:00
4ef0bdbcb6
Suppress this warning not globally in disable_warnings.h
2018-01-24 14:21:16 +00:00
f25b6b9b52
cast
2018-01-24 13:10:37 +00:00
dc2f37a4ae
disable/enable warnings
2018-01-24 08:59:20 +00:00
6269309d86
Use CGAL include for boost counting/transform iterators everywhere
2018-01-23 11:09:52 +01:00
c3215b9331
Move graph_has_property from namespace boost to namespace CGAL and provide some doc for it.
2018-01-22 12:43:29 +01:00
87ddddf04b
Merge pull request #2278 from maxGimeno/Integrate_remeshing_plugin_into_mesh_3-GF
...
Polyhedron_demo: Remove the Remeshing_plugin
2018-01-19 15:22:41 +01:00
5efce459da
Mesh_3
2018-01-18 08:49:52 +00:00
5e7ad51345
Merge pull request #2681 from lrineau/Mesh_3-fix_CGAL_SEQUENTIAL_MESH_3_ADD_OUTSIDE_POINTS_ON_A_FAR_SPHERE-GF
...
Mesh_3: fix CGAL_SEQUENTIAL_MESH_3_ADD_OUTSIDE_POINTS_ON_A_FAR_SPHERE
2018-01-17 10:43:30 +01:00
81800eb937
Add a feature to the Mesh_3_plugin that allows to create a Facegraph_item when performing a surface_meshing.
2018-01-15 11:17:37 +01:00
5a559d88d2
Avoid one call to 'at'
2018-01-08 10:42:47 +01:00
42b11ddf29
Revert the merge of PR #2478
...
This reverts the merge commit 46cc91e787488c3e2879
2018-01-04 17:54:08 +01:00
0d0bcc687b
Fixed warning
2017-12-20 16:02:59 +01:00
9667bb7618
Added Is_in_domain and Construct_initial_points to periodic's Labeled_mesh_domain
2017-12-20 11:39:22 +01:00
9d923cf30d
Fixed namespace order issue sneaking through the master merge
2017-12-19 17:31:23 +01:00
0bca01d872
Merge branch 'Periodic_3_mesh_3-Feature-MBogdanov-old' into Periodic_3_mesh_3-Feature-MBogdanov
2017-12-19 17:22:03 +01:00
14b810d87c
Merge pull request #2680 from lrineau/Mesh_3-improve_polylines_to_protect-GF
...
Fix a compilation error (on CentOS5)
2017-12-19 16:31:00 +01:00
d2ece33849
Documented Mesh_3's and P3M3's medit IO function
2017-12-19 15:44:26 +01:00
27fce35ca1
Fixed warning
2017-12-16 12:52:10 +01:00
2f09c7a8d7
Tiny debug code change
2017-12-15 20:22:51 +01:00
c6f58bce4e
Reworked the way periodicity is defined
...
The input domain does not need to be periodic. It is the domain class that
has to handle the periodicity. This is cleaner mathematically and will be
more natural for other types of domains.
Along the way, the labeled periodic domain is brought up to date with Mesh_3's
(bug fixes, null subdomain index, etc.)
2017-12-15 17:25:42 +01:00
f222d0fd13
Tiny indentation fix
2017-12-15 16:25:53 +01:00
4a172154f3
Changed Mesh_options' number_of_initial points to have '-1' as default
...
'0' is now considered a valid number of input points. This is useful
for P3M3 because it might be impossible to construct initial points.
This also aligns with the default value in the C3T3_initializer class.
2017-12-15 16:25:29 +01:00
8bd5896baf
Fix Mesh_3 if that macro is defined
...
With recent changes, Mesh_3 was no longer compiler with
`CGAL_SEQUENTIAL_MESH_3_ADD_OUTSIDE_POINTS_ON_A_FAR_SPHERE` defined.
This commit fixes the compilation issue.
2017-12-13 18:10:09 +01:00
a3b979e0b8
Fix a compilation error (on CentOS5)
2017-12-13 16:50:40 +01:00
9e1567d2ef
Disabled medit-dumping in c3t3_dump if the triangulation is not periodic
2017-12-13 16:17:22 +01:00
0e71201778
Renamed template parameters to avoid conflicts with base class typedefs
2017-12-12 11:25:27 +01:00
7ea60dc613
Removed 'FT' from Slivers_exuder parameters
...
It's redundant and creates issues since Slivers_exuder's base has a 'FT' typedef
2017-12-12 00:48:27 +01:00
22f59fa514
Added a postcondition
2017-12-12 00:45:51 +01:00
0fcc6c0d29
Mesh_3 criteria: Changed code from 'Badness' to 'Is_bad' to align with concept
...
Code using "*_badness" (specification from CGAL < 3.7) is no longer accepted.
2017-12-08 11:32:12 +01:00
671fe63cfa
Cleaned output
2017-12-06 11:00:18 +01:00
34d53aa2d9
Merge branch 'Periodic_3_mesh_3-Feature-MBogdanov-old' into Periodic_3_mesh_3-Feature-MBogdanov
2017-12-05 20:32:30 +01:00
a309861d25
Renamed functor
2017-12-05 18:38:37 +01:00
0c0a6942f8
Uninitiliazed vertices must be filtered due to triangulations of dim < 3
2017-12-05 18:37:50 +01:00
b54a24481b
Added a comment
2017-12-05 18:34:40 +01:00
3a6bb213d4
Restored comment
2017-12-05 18:32:40 +01:00
00f6a874e2
Minor doc fixes
2017-12-05 18:32:30 +01:00
1e9dc4968d
Partial revert of 7f4d85ff3dff786583e5aa4c13a98a8d3938e485
...
Doesn't make sense to use the hash function to compare handles. Compilation
would show it... but the class is unused / untested
2017-12-05 18:31:05 +01:00
31ef3f601d
Removed useless references
2017-12-05 18:30:41 +01:00
c961014fb4
Merge pull request #2583 from lrineau/Mesh_3-improve_polylines_to_protect-GF
...
Mesh 3: improve polylines_to_protect()
2017-12-05 18:19:47 +01:00
b7479f352c
no_topological_change() always returns 'false' for periodic triangulations
...
see comment in the code.
2017-12-05 16:36:15 +01:00
666a143361
Cleaned periodic code from no_topological_change()
2017-12-05 16:35:50 +01:00
c7297410e3
Minor improvements to tet soup reading
2017-12-05 15:48:51 +01:00
14d8540c82
Enhanced medit output for periodic meshes
...
(looks exactly like Mesh_3's now)
2017-12-04 16:09:18 +01:00
9e99cf7d59
Fix a warning
...
```
In file included from .../include/CGAL/Mesh_3/polylines_to_protect.h:34:0,
from /home/cgal_tester/build/src/cmake/platforms/Fedora-32/test/Mesh_3_Examples/mesh_3D_image_with_features.cpp:40:
.../include/CGAL/internal/Mesh_3/Graph_manipulations.h: In instantiation of 'CGAL::internal::Mesh_3::Graph_manipulations<Graph, Point_3, NT, InterpolationFunctor>::Graph_manipulations(Graph&, InterpolationFunctor) [with Graph = boost::adjacency_list<boost::setS, boost::vecS, boost::undirectedS, CGAL::Point_3<CGAL::Epick>, boost::no_property, boost::no_property, boost::listS>; Point_3 = CGAL::Point_3<CGAL::Epick>; NT = unsigned char; InterpolationFunctor = CGAL::internal::Mesh_3::Returns_midpoint<CGAL::Epick, unsigned char>]':
.../include/CGAL/Mesh_3/polylines_to_protect.h:255:63: required from 'void CGAL::polylines_to_protect(const CGAL::Image_3&, double, double, double, std::vector<std::vector<IC> >&, Image_word_type*, Null_subdomain_index, DomainFunctor, InterpolationFunctor, PolylineInputIterator, PolylineInputIterator) [with P = CGAL::Point_3<CGAL::Epick>; Image_word_type = unsigned char; Null_subdomain_index = CGAL::Null_subdomain_index; DomainFunctor = CGAL::Identity<unsigned char>; InterpolationFunctor = CGAL::internal::Mesh_3::Returns_midpoint<CGAL::Epick, unsigned char>; PolylineInputIterator = __gnu_cxx::__normal_iterator<std::vector<CGAL::Point_3<CGAL::Epick>, std::allocator<CGAL::Point_3<CGAL::Epick> > >*, std::vector<std::vector<CGAL::Point_3<CGAL::Epick>, std::allocator<CGAL::Point_3<CGAL::Epick> > > > >]'
.../include/CGAL/Mesh_3/polylines_to_protect.h:802:5: required from 'void CGAL::polylines_to_protect(const CGAL::Image_3&, std::vector<std::vector<IC> >&, Image_word_type*, Null_subdomain_index, PolylineInputIterator, PolylineInputIterator) [with P = CGAL::Point_3<CGAL::Epick>; Image_word_type = unsigned char; Null_subdomain_index = CGAL::Null_subdomain_index; PolylineInputIterator = __gnu_cxx::__normal_iterator<std::vector<CGAL::Point_3<CGAL::Epick>, std::allocator<CGAL::Point_3<CGAL::Epick> > >*, std::vector<std::vector<CGAL::Point_3<CGAL::Epick>, std::allocator<CGAL::Point_3<CGAL::Epick> > > > >]'
.../include/CGAL/Mesh_3/polylines_to_protect.h:780:5: required from 'void CGAL::polylines_to_protect(const CGAL::Image_3&, std::vector<std::vector<IC> >&, PolylineInputIterator, PolylineInputIterator) [with P = CGAL::Point_3<CGAL::Epick>; Image_word_type = unsigned char; PolylineInputIterator = __gnu_cxx::__normal_iterator<std::vector<CGAL::Point_3<CGAL::Epick>, std::allocator<CGAL::Point_3<CGAL::Epick> > >*, std::vector<std::vector<CGAL::Point_3<CGAL::Epick>, std::allocator<CGAL::Point_3<CGAL::Epick> > > > >]'
/home/cgal_tester/build/src/cmake/platforms/Fedora-32/test/Mesh_3_Examples/mesh_3D_image_with_features.cpp:62:71: required from here
.../include/CGAL/internal/Mesh_3/Graph_manipulations.h:49:10: warning: 'CGAL::internal::Mesh_3::Graph_manipulations<boost::adjacency_list<boost::setS, boost::vecS, boost::undirectedS, CGAL::Point_3<CGAL::Epick>, boost::no_property, boost::no_property, boost::listS>, CGAL::Point_3<CGAL::Epick>, unsigned char, CGAL::internal::Mesh_3::Returns_midpoint<CGAL::Epick, unsigned char> >::g' will be initialized after [-Wreorder]
Graph& g;
^
.../include/CGAL/internal/Mesh_3/Graph_manipulations.h:48:24: warning: 'CGAL::internal::Mesh_3::Returns_midpoint<CGAL::Epick, unsigned char> CGAL::internal::Mesh_3::Graph_manipulations<boost::adjacency_list<boost::setS, boost::vecS, boost::undirectedS, CGAL::Point_3<CGAL::Epick>, boost::no_property, boost::no_property, boost::listS>, CGAL::Point_3<CGAL::Epick>, unsigned char, CGAL::internal::Mesh_3::Returns_midpoint<CGAL::Epick, unsigned char> >::interpolate' [-Wreorder]
InterpolationFunctor interpolate;
^~~~~~~~~~~
.../include/CGAL/internal/Mesh_3/Graph_manipulations.h:51:3: warning: when initialized here [-Wreorder]
Graph_manipulations(Graph& g,
^~~~~~~~~~~~~~~~~~~
```
2017-12-04 11:38:46 +01:00
5e810e3c09
Replaced std::map with unordered map + timestamp hash function
2017-12-01 19:07:55 +01:00
f867ba1742
Added a safeguard to not call front() on a emtpy bimap
...
and a print function for pre stars
2017-12-01 18:36:05 +01:00
Laurent Rineau
Mael Rouxel-Labbé
Andreas Fabri
Jane Tournois
Sébastien Loriot
Simon Giraudot
Maxime Gimeno