Commit Graph
2086 Commits
Author SHA1 Message Date
Laurent Rineau a3b979e0b8 Fix a compilation error (on CentOS5) 2017-12-13 16:50:40 +01:00
Mael Rouxel-Labbé 9e1567d2ef Disabled medit-dumping in c3t3_dump if the triangulation is not periodic 2017-12-13 16:17:22 +01:00
Mael Rouxel-Labbé 0e71201778 Renamed template parameters to avoid conflicts with base class typedefs 2017-12-12 11:25:27 +01:00
Mael Rouxel-Labbé 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
Mael Rouxel-Labbé 22f59fa514 Added a postcondition 2017-12-12 00:45:51 +01:00
Mael Rouxel-Labbé 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
Mael Rouxel-Labbé 671fe63cfa Cleaned output 2017-12-06 11:00:18 +01:00
Mael Rouxel-Labbé 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
Mael Rouxel-Labbé a309861d25 Renamed functor 2017-12-05 18:38:37 +01:00
Mael Rouxel-Labbé 0c0a6942f8 Uninitiliazed vertices must be filtered due to triangulations of dim < 3 2017-12-05 18:37:50 +01:00
Mael Rouxel-Labbé b54a24481b Added a comment 2017-12-05 18:34:40 +01:00
Mael Rouxel-Labbé 3a6bb213d4 Restored comment 2017-12-05 18:32:40 +01:00
Mael Rouxel-Labbé 00f6a874e2 Minor doc fixes 2017-12-05 18:32:30 +01:00
Mael Rouxel-Labbé 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
Mael Rouxel-Labbé 31ef3f601d Removed useless references 2017-12-05 18:30:41 +01:00
Laurent Rineau 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
Mael Rouxel-Labbé b7479f352c no_topological_change() always returns 'false' for periodic triangulations
see comment in the code.
2017-12-05 16:36:15 +01:00
Mael Rouxel-Labbé 666a143361 Cleaned periodic code from no_topological_change() 2017-12-05 16:35:50 +01:00
Mael Rouxel-Labbé c7297410e3 Minor improvements to tet soup reading 2017-12-05 15:48:51 +01:00
Mael Rouxel-Labbé 14d8540c82 Enhanced medit output for periodic meshes
(looks exactly like Mesh_3's now)
2017-12-04 16:09:18 +01:00
Laurent Rineau 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
Mael Rouxel-Labbé 5e810e3c09 Replaced std::map with unordered map + timestamp hash function 2017-12-01 19:07:55 +01:00
Mael Rouxel-Labbé 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
Mael Rouxel-Labbé c6a91e3281 Misc minor changes 2017-12-01 18:33:05 +01:00
Mael Rouxel-Labbé 811b722d13 Renamed incident_vertices to adjacent_vertices 2017-12-01 09:02:38 +01:00
Mael Rouxel-Labbé 8a9750709b Moved the timestamp hash function to STL_extension (and rewrote it) 2017-12-01 08:44:12 +01:00
Mael Rouxel-Labbé b92519370b Minor changes to c3t3 io
Main change: don't segfault if a tet id is erroneously larger
than the max vertex id
2017-11-30 17:11:30 +01:00
Mael Rouxel-Labbé b00e65ec67 Fixed missing parameters in some "do_is_bad" 2017-11-30 17:01:33 +01:00
Mael Rouxel-Labbé ba3a59ed5a Merge branch 'Periodic_3_mesh_3-Feature-MBogdanov-old' into Periodic_3_mesh_3-Feature-MBogdanov 2017-11-30 15:54:00 +01:00
Mael Rouxel-Labbé 11f35f57ed Reworked how the periodic protection class is selected
Rather than overwriting Mesh_3's, a virtual function is used in the initializer.
This allows to use Mesh_3 along Periodic_3_mesh_3.
2017-11-30 15:15:07 +01:00
Mael Rouxel-Labbé 1078e00e7f Uniformized between Mesh_3::internal and internal::Mesh_3 2017-11-30 14:26:12 +01:00
Mael Rouxel-Labbé e996e173da Fixed considering infinite vertices in 3D images initialization 2017-11-30 11:26:28 +01:00
Mael Rouxel-Labbé 9b8c5cd824 Another batch of v->point() --> tr.point(v) 2017-11-29 17:48:55 +01:00
Mael Rouxel-Labbé 0434f3c81d Cleaned off useless variable 2017-11-29 16:33:31 +01:00
Mael Rouxel-Labbé 45e93cacfd Misc minor changes 2017-11-29 16:32:05 +01:00
Mael Rouxel-Labbé 78133c5100 Replaced usages of '.weight()' in Mesh_3 and P3M3
Either through the comparison predicate or the weight constructor.
2017-11-29 16:30:34 +01:00
Mael Rouxel-Labbé 23385b440d Fixed typo 2017-11-29 12:33:35 +01:00
Mael Rouxel-Labbé 67fde8ea05 Misc minor changes 2017-11-28 15:25:52 +01:00
Mael Rouxel-Labbé b352e0870d Fixed not checking if result of find is end() 2017-11-27 17:42:05 +01:00
Mael Rouxel-Labbé ce0c2afd40 Readability changes
Increasing reader sanity, one commit at a time
2017-11-24 11:19:21 +01:00
Mael Rouxel-Labbé 812109df83 Added Mesh_3_regular_triangulation_3_wrapper
This wrapper around Regular_triangulation_3 adds undocumented, straightforward
functions which are required for Mesh_3 because of Periodic_3_mesh_3:
they are functions for which both (periodic and non-periodic) triangulations
have fundamentally different implementations, usually because Periodic_3_mesh_3
does not know the offset of a point and must brute-force check all
possibilities. To allow Periodic_3_mesh_3 to use Mesh_3's files,
each mesh triangulation implements its own version.
2017-11-22 14:23:59 +01:00
Mael Rouxel-Labbé 1ef2b24dd4 Cleaned some comments/output 2017-11-22 14:15:05 +01:00
Mael Rouxel-Labbé b25a4f1151 Added an assertion to detect bad inputs earlier 2017-11-22 14:11:51 +01:00
Mael Rouxel-Labbé 3a1a07706f Replaced hash function in a set of vertex handles 2017-11-22 11:59:55 +01:00
Mael Rouxel-Labbé dc5c6d4395 Fixed sq_distance_to_closest_vertex for triangulations of dim < 3 2017-11-22 11:59:00 +01:00
Mael Rouxel-Labbé b1e2f3cb04 Clarified comment 2017-11-22 11:58:39 +01:00
Mael Rouxel-Labbé 722fa7496f Cleaned some periodic-related stuff from Mesh_3 2017-11-22 11:05:44 +01:00
Mael Rouxel-Labbé 6567be18e7 Fixed operator << for Mesh_surface_cell_base_3 2017-11-22 10:55:07 +01:00
Mael Rouxel-Labbé e32acca794 Made *_visitor_with_balls compatible with P3RT3 2017-11-22 10:39:07 +01:00
Mael Rouxel-Labbé aa43fbf1f4 Fixed typo 2017-11-22 10:13:01 +01:00