Commit Graph

193 Commits

Author SHA1 Message Date
Andreas Fabri aff5dbc5c9 check for boost version < 1.60 2016-02-15 19:15:06 +01:00
Simon Giraudot 6607436610 Move #pragma at beginning/end of document 2016-02-05 15:32:19 +01:00
Andreas Fabri c473841ad2 suppress a warning 2016-02-05 14:59:10 +01:00
Sébastien Loriot 443b8cc2d7 precompute area functor 2016-02-01 10:23:29 +01:00
Sébastien Loriot 72c8aa7b05 make 2D-lloyd working with the projection traits 2016-01-29 15:16:51 +01:00
Laurent Rineau e0f8f4f85f Refresh the branch Mesh_3-manifold_criterion-lrineau
For the moment, the manifold feature is no longer working.

Merge remote-tracking branch 'cgal-dev/Mesh_3-manifold_criterion-lrineau' into Mesh_3-manifold_criterion-lrineau

Conflicts:
	Mesh_3/include/CGAL/Mesh_3/Mesh_complex_3_in_triangulation_3_base.h
	Mesh_3/include/CGAL/Mesh_3/Mesher_3.h
	Mesh_3/include/CGAL/Mesh_3/Refine_facets_3.h
	Polyhedron/demo/Polyhedron/Polyhedron_3.cpp
	Polyhedron/demo/Polyhedron/Polyhedron_demo_mesh_3_plugin.cpp
	Polyhedron/demo/Polyhedron/Polyhedron_demo_mesh_3_plugin_cgal_code.cpp
2015-12-18 14:55:20 +01:00
Andreas Fabri 0e59c3488a 12 -> 8 2015-12-07 17:36:11 +01:00
Andreas Fabri dd17f1ad5d Set BOOST_PARAMETER_MAX_ARITY to the needed value in the concerned packages 2015-12-01 17:05:53 +01:00
Andreas Fabri 2ce8b07ec0 Define BOOST_PARAMETER_MAX_ARITY in <CGAL/config.h>
This macro has to be larger than the default value
and it must be set before including <boost/parameter.hpp>

Instead of setting it to 12 in the packages that
need it, we do this in <CGAL/config.h> and produce
an error if a user has set it to a value < 12
2015-11-16 11:21:31 +01:00
Jane Tournois 1de18c20a8 avoid returning a ref to temporary object 2015-06-01 14:50:51 +02:00
Jane Tournois 81d77803d3 avoid storing a std::pair
this is an attempt to fix the compilation error in the testsuite
for clang-6.0 and cpp11
2015-06-01 14:50:40 +02:00
Jane Tournois 828eed2b24 calling a constructor from a constructor is cpp11 2015-05-19 10:01:00 +02:00
Jane Tournois 8511ff88b8 add copyright 2015-05-19 09:07:54 +02:00
Jane Tournois 13aa560db6 fix warning about variable "tr" not used 2015-05-19 09:07:54 +02:00
Jane Tournois 3f798a6542 add another pragma to ignore warning from clang 2015-05-19 09:04:28 +02:00
Jane Tournois 8e61cfdd49 new attempt to fix unused variables warning from boost with clang
and add namespace CGAL for Lloyd 2D parameters
2015-05-19 09:04:28 +02:00
Jane Tournois 6808066af3 fix warning from boost with gcc 2015-05-19 09:04:28 +02:00
Andreas Fabri 2cda7ff7f6 min() -> (min)() 2015-05-19 09:04:28 +02:00
Andreas Fabri 74c817fe7f Add an include 2015-05-19 09:04:27 +02:00
Jane Tournois 0c6b51f46f add newline at end of file
fix warnings
2015-05-19 09:04:27 +02:00
Jane Tournois 9322f881c5 fix unused variable, and implement barycentric coordinates on an edge 2015-05-19 09:04:27 +02:00
Jane Tournois cc801f779f fix unused parameter warnings 2015-05-19 09:04:26 +02:00
Jane Tournois 1517354702 fix unused variable warning 2015-05-19 09:04:26 +02:00
Jane Tournois f8c3ef0a30 fix compilation for (max) 2015-05-19 09:04:26 +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
Sébastien Loriot 67049fbdd4 add missing typename 2015-05-19 08:54:37 +02:00
Sébastien Loriot f4addd127b fix compilation issue with g++ 2015-05-19 08:54:36 +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
Jane Tournois c7138ff48d add barycentric coordinates to compute sizing at p inside a face
+ add code to interpolate on finite vertices of an infinite face

they are not used by default because it's expensive, unless the macro
CGAL_MESH_2_SIZING_FIELD_USE_BARYCENTRIC_COORDINATES is defined.
Can be useful to be more precise about the sizing
2015-05-19 08:54:35 +02:00
Jane Tournois 717e795c1a make the specification of DelaunayMeshFaceBase_2 complete
+ change access functions names to make them conform to CGAL
+ add preconditions in the code
2015-05-19 08:54:33 +02:00
Jane Tournois 4cf8655c00 move all the cdt.dual(v) code from Triangulation_2 to Mesh_2
we do not change the API of Triangulation_2 for now
maybe later, and this version should be easy to keep backward compatible
2015-05-19 08:54:33 +02:00
Jane Tournois 2b7d774c36 fix the convergence criterion 2014-11-28 12:59:31 +01:00
Andreas Fabri 2916850771 use iformat for reading doubles 2014-11-26 16:53:50 +01:00
Jane Tournois d119879313 add namespace parameters for parameters of lloyd_optimize_mesh_2 2014-11-25 10:42:38 +01:00
Jane Tournois bd08614cc1 fix compilation 2014-11-24 17:01:14 +01:00
Jane Tournois 7e037664e6 fix compilation when verbose mode is off 2014-11-24 17:00:29 +01:00
Jane Tournois f76c88f2fe cleaning 2014-11-24 15:03:35 +01:00
Jane Tournois 78eff786e5 fix missing parameter 2014-11-21 16:21:10 +01:00
Jane Tournois 3e8416954f add mark as a parameter for lloyd_optimize_mesh_2
this allow to choose (as in refine_Delaunay_mesh_2 if
the seeds describe the domain to be meshed (inside), or the complementary
2014-11-21 15:51:28 +01:00
Jane Tournois acdf610682 fix compilation when no seed is given 2014-11-21 11:23:07 +01:00
Jane Tournois e4161ce685 handle seeds in lloyd_optimize_mesh_2 2014-11-20 16:13:46 +01:00
Jane Tournois bd9bbd0427 remove Odt for now 2014-11-20 15:00:55 +01:00
Jane Tournois fbab5edb60 return Mesh_optimization_return_code as Mesh_3 optimizers do 2014-11-18 11:25:09 +01:00
Jane Tournois b2edb9d20b introduce freezing of vertices that do not move enough 2014-11-18 10:48:23 +01:00
Jane Tournois 338a9593f7 use boost named parameters as done in Mesh_3 2014-11-17 16:54:24 +01:00
Jane Tournois b641f2f257 use time limit 2014-11-17 16:53:25 +01:00
Jane Tournois 562ef9f972 use Mesh_sizing_field as in Mesh_3 for Lloyd optimization
this avoids migration phenomena of vertices, that "break"
the distribution of points built during the refinement process
2014-11-14 13:04:48 +01:00
Jane Tournois be2003940f fix histogram function 2014-11-14 12:39:56 +01:00
Jane Tournois ab9811ad8b add output of angles histograms 2014-11-13 16:29:21 +01:00
Jane Tournois 8647878a6a use check_convergence() to stop optimization when vertices do not move enough
the convergence ratio is set to 0.001 by default

+ fix the use of moving_vertices for iterations after the first one
2014-11-12 17:13:18 +01:00