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

1969 Commits

Author SHA1 Message Date
Laurent Rineau 3845494b5c Merge pull request #3151 from lrineau/Mesh_3-fix_uninitialized_variables-GF 
Mesh_3: Fix the warnings about uninitialized variables
 2018-06-12 16:38:27 +02:00
Mael Rouxel-Labbé ddeb4c0cd7 Merge branch 'Periodic_3_mesh_3-Feature-MBogdanov-old' into Periodic_3_mesh_3-Feature-MBogdanov 2018-06-07 15:14:19 +02:00
Andreas Fabri e20aca8806 More disabling of warnings 2018-06-07 13:26:52 +01:00
Mael Rouxel-Labbé 27b6e03968 Added some missing header includes 2018-06-07 10:24:15 +02:00
Mael Rouxel-Labbé 5a13bb8bb7 Fixed typos 2018-06-06 16:30:51 +02:00
Laurent Rineau 0d7c2c41af Merge pull request #3139 from lrineau/Mesh_3-fix_verbose_mode-lrineau 
Mesh_3: fix verbose mode (when the manifold criterion is used)
 2018-06-06 14:39:13 +02:00
Mael Rouxel-Labbé cdda597e4e Renamed the medit output function 2018-06-06 11:58:36 +02:00
Mael Rouxel-Labbé e81fe3cc1d Fixed bad merge 2018-06-05 15:29:55 +02:00
Mael Rouxel-Labbé d97d388ef4 Reworked Periodic 3 mesh domain classes 
No need to duplicate Labeled_mesh_domain_3 anymore: a wrapper is used.
 2018-06-05 14:42:03 +02:00
Mael Rouxel-Labbé 7ea3a8044e Merge branch 'Periodic_3_mesh_3-Feature-MBogdanov-old' into Periodic_3_mesh_3-Feature-MBogdanov 2018-06-05 14:39:18 +02:00
Laurent Rineau d108f920d2 Fix conversion warnings in polylines_to_protect 2018-06-05 11:21:28 +02:00
Laurent Rineau aa8c4c2f87 Fix a warning 
Do not initialize with `Bare_point()`, because that value has uninitialized
coordinates. And that gave warnings.
 2018-06-05 10:46:07 +02:00
Laurent Rineau dfa08102c3 Fix the warnings about get_least_square_surface_plane 
The previous implementation of `get_least_square_surface_plane` and
`project_on_surface`, in `C3T3_helpers`, was using uninitialized
values. Now, it uses `boost::optional`.
 2018-06-04 19:44:37 +02:00
Laurent Rineau 335034e3cf Fix the CGAL_MESH_3_VERBOSE mode 2018-05-31 16:11:07 +02:00
Laurent Rineau a959f4115d Do not include the headers of deprecated classes 2018-05-30 18:38:08 +02:00
Andreas Fabri 89d96f4ce8 An #ifdef inside a CGAL_assertion_msg() does not compile on VC12 2018-05-30 08:15:31 +01:00
Simon Giraudot 16c0ae5f45 Fix TBB includes in Mesh_3 2018-05-29 11:42:04 +02:00
Laurent Rineau e14bad3df4 Workaround for MSVC 
The MSVC is confused by the name `Function` being at the same time a
template parameter and a typedef of the base class.

```
...\include\CGAL/Implicit_mesh_domain_3.h(73): error C2248: 'CGAL::Labeled_mesh_domain_3<BGT,int,std::pair<int,int>>::Function': cannot access private typedef declared in class 'CGAL::Labeled_mesh_domain_3<BGT,int,std::pair<int,int>>'
        with
        [
            BGT=K
        ]
```
 2018-05-29 10:30:43 +02:00
Laurent Rineau 2766e1ff5d Merge 'master' and fix conflicts 2018-05-28 16:40:09 +02:00
Laurent Rineau 588cc67897 Merge pull request #3096 from MaelRL/CGAL-Fix_deprecated_code_usage-GF 
Fix some deprecation-related issues
 2018-05-28 13:58:41 +02:00
Laurent Rineau 2ad4781a05 Merge pull request #3092 from maxGimeno/Travis-Check_including_all_headers-GF 
Infrastructure : Test compilation of headers
 2018-05-28 13:58:19 +02:00
Laurent Rineau f20743cc20 Merge pull request #3096 from MaelRL/CGAL-Fix_deprecated_code_usage-GF 
Fix some deprecation-related issues
 2018-05-28 11:00:45 +02:00
Laurent Rineau d7d39e9036 Merge pull request #3092 from maxGimeno/Travis-Check_including_all_headers-GF 
Infrastructure : Test compilation of headers
 2018-05-28 11:00:39 +02:00
Mael Rouxel-Labbé 497c8ccb50 Fixed conversion warning (changes mirrored from: 683fa43) 2018-05-24 14:18:40 +02:00
Mael Rouxel-Labbé edf84b155e Added a virtual destructor to silence a warning 2018-05-24 14:17:58 +02:00
Andreas Fabri 76c260142b Add #include 2018-05-23 11:48:59 +02:00
Andreas Fabri 4de6c30323 Add missing #include 2018-05-23 11:48:59 +02:00
Andreas Fabri 6e828da0e9 Move stuff to CGAL/boost/parameter 2018-05-23 11:48:59 +02:00
Andreas Fabri f6cd1e0bcf Factorize boost parameters in the file CGAL/boost/parameter.h 2018-05-23 11:48:59 +02:00
Andreas Fabri c15306df4c Put duplicated functors in an extra file 2018-05-23 11:48:58 +02:00
Laurent Rineau 13518a0501 Fix check_headers 2018-05-16 17:38:39 +02:00
Laurent Rineau 6653dabc62 Add the license-checking #include 2018-05-16 11:07:13 +02:00
Laurent Rineau 337d49a3ad Fix compatibility with C++03 2018-05-15 16:25:32 +02:00
Laurent Rineau cd032f05fc Do not store const& to the function/functor by copy by value 
However, one cannot store a function type directly, but only *pointers* to
function types. So I used Boost MPL to discriminate between function types
and other callable (such as lambdas or functors, that can be copied).
 2018-05-15 15:13:05 +02:00
Laurent Rineau 301181ca53 Fix compilation bug with CGAL_MESH_3_PROTECTION_DEBUG 2018-05-15 15:13:05 +02:00
Laurent Rineau c616f66811 Use static_evaluate 2018-05-15 15:13:05 +02:00
Laurent Rineau ae0b45b79f Fix a compilation bug if Mesh_3 and Mesh_2 are both used 
The conflict is withing the Boost parameters defined for Lloyd 2D and
Lloyd 3D.
 2018-05-15 15:13:05 +02:00
Laurent Rineau a140ed004c Remove the `const bool = true` from the function wrappers 2018-05-15 15:13:04 +02:00
Laurent Rineau 30ff350986 Deprecate Implicit_mesh_domain_3 as well 2018-05-15 15:13:04 +02:00
Laurent Rineau f0233cfbf7 Remove the domain classes deprecated since CGAL-4.5. 
Mael talked about that in his review.
 2018-05-15 15:13:04 +02:00
Laurent Rineau ae255e248f Remove trivial, useless, buggy documentation comments 2018-05-15 14:56:24 +02:00
Laurent Rineau b61cef82dd Wording 
See Mael's comment:
https://github.com/CGAL/cgal/pull/2739#discussion_r175448829
 2018-05-15 14:56:24 +02:00
Laurent Rineau 0cacf1a1bb Document where the geometric objects come from (from BGT) 
See Mael's comment:
https://github.com/CGAL/cgal/pull/2739#discussion_r175414307
 2018-05-15 14:56:23 +02:00
Laurent Rineau a40cad5291 Remove an unused template parameter 2018-05-15 14:56:23 +02:00
Laurent Rineau 5a38837588 fixup! Force nodes on the edges of the cube to be terminal nodes 2018-05-15 14:56:23 +02:00
Laurent Rineau d91929a539 Force nodes on the edges of the cube to be terminal nodes 2018-05-15 14:56:23 +02:00
Laurent Rineau f362ecd516 Support image offsets in polylines_to_protect 2018-05-15 14:56:23 +02:00
Laurent Rineau a09757b775 Fix compilation in C++03 2018-05-15 14:56:23 +02:00
Laurent Rineau c20f0bc843 result_type is used by polylines_to_protect() 2018-05-15 14:56:23 +02:00
Laurent Rineau a76e43de94 Handle the image offset 2018-05-15 14:56:23 +02:00
Laurent Rineau 82f900bcb6 Add Labeled_mesh_domain_3<K>::create_labeled_image_mesh_domain 
... and deprecate `CGAL::Labeled_image_mesh_domain_3`.
 2018-05-15 14:56:22 +02:00
Laurent Rineau 9126b7aa65 Use boost/shared_ptr.hpp to re-enable move semantic 2018-05-15 14:56:22 +02:00
Laurent Rineau db224d2998 Fix the code when Surface_patch_index is not std::pair<int,int> 2018-05-15 14:56:22 +02:00
Laurent Rineau 1dfbb84bf0 Add Labeled_mesh_domain_3<K>::create_gray_image_mesh_domain 
... and deprecate `CGAL::Gray_image_mesh_domain_3`.
 2018-05-15 14:56:22 +02:00
Laurent Rineau f0ad9b4872 Correct use of CGAL_NO_DEPRECATED_CODE 2018-05-15 14:56:22 +02:00
Laurent Rineau e687db7b61 Missing #include 2018-05-15 14:56:22 +02:00
Laurent Rineau c3de61a1d9 Use <boost/noncopyable.hpp> instead of our home-made solution 2018-05-15 14:56:22 +02:00
Laurent Rineau 87066b93a1 Rename a function for readability 2018-05-15 14:56:22 +02:00
Laurent Rineau 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
Laurent Rineau 0d839ce60a Correct usage of Boost Parameters 2018-05-15 14:56:21 +02:00
Laurent Rineau 8b25761094 Add a constructor using Boost Parameters 2018-05-15 14:56:21 +02:00
Laurent Rineau 0400eb6c4b Cleanup included header for Boost Parameters 2018-05-15 14:56:21 +02:00
Laurent Rineau fd1a788851 Replace Default by the real type default 2018-05-15 14:56:21 +02:00
Laurent Rineau 85d9e02cc3 Call iso_cuboid in the Impl_details base class 2018-05-15 14:56:21 +02:00
Laurent Rineau 91b6dc3b13 Add Construct_surface_patch_index to the Impl_details 2018-05-15 14:56:21 +02:00
Laurent Rineau 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
Laurent Rineau 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
Laurent Rineau 1a3c4436ae WIP: allow to change the Surface_patch_index type 2018-05-15 14:56:21 +02:00
Laurent Rineau 79829ffb99 Move Index_generator to another header 2018-05-15 14:56:21 +02:00
Laurent Rineau c751c1fc39 Rename the file 2018-05-15 14:56:21 +02:00
Laurent Rineau 9655043e69 Add debug instructions 2018-05-15 14:56:21 +02:00
Laurent Rineau c19c84a022 Fix a line of code that was never tested 2018-05-15 14:56:21 +02:00
Laurent Rineau 2a66790614 Fix a bug 
and add assertions. The assertions use lambda expression to display useful
information.
 2018-05-15 14:56:21 +02:00
Laurent Rineau 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
Laurent Rineau 1d5e9e9150 WIP: implementation for scalar image 
... tested only on segmented images!
 2018-05-15 14:56:20 +02:00
Mael Rouxel-Labbé c238d7822d Moved functions's bodies 2018-05-03 14:52:52 +02:00
Mael Rouxel-Labbé d629406451 Fixed bad auto merge 2018-05-03 14:22:26 +02:00
Mael Rouxel-Labbé 7630458123 Added some safety nets on find() calls 2018-05-03 14:22:07 +02:00
Mael Rouxel-Labbé eda93364be Made register_corner() public (but undocumented) 2018-05-03 14:19:23 +02:00
Mael Rouxel-Labbé 1f9655f935 Add 'add_corner_with_context' 2018-05-03 12:53:30 +02:00
Mael Rouxel-Labbé 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
Mael Rouxel-Labbé 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
Mael Rouxel-Labbé 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
Mael Rouxel-Labbé 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
Mael Rouxel-Labbé e8888239e1 Fixed using deprecated code 2018-04-27 14:09:57 +02:00
Mael Rouxel-Labbé 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
Mael Rouxel-Labbé 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
Andreas Fabri c54a6a4980 Put CGAL::random_shuffle() in the subnamespace cpp98 2018-04-11 09:32:23 +01:00
Andreas Fabri 063a91a771 Use CGAL::random_shuffle 2018-04-04 14:00:23 +01:00
Laurent Rineau 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
Laurent Rineau cd6fe20bd4 Merge branch 'releases/CGAL-4.11-branch' 2018-03-26 11:03:37 +02:00
Laurent Rineau 3c70f8bad0 Fix dependencies by moving files 2018-03-23 14:17:24 +01:00
Jane Tournois b9f4a4e06b implement number_of_corners(), that is documented 2018-03-23 11:54:53 +01:00
Laurent Rineau c504ea3e9f Fixes 
- cleanup
- be careful not to add things to the documentation
 2018-03-22 17:23:28 +01:00
Andreas Fabri 8c41669fb7 move properties from Mesh_3 to BGL, Polyhedron_3 and Surface_mesh 2018-03-22 16:37:37 +01:00
Mael Rouxel-Labbé 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
Andreas Fabri 5d1cd90517 Add two typename 2018-03-05 14:17:26 +00:00
Laurent Rineau 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
Mael Rouxel-Labbé 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
Mael Rouxel-Labbé 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