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

257 Commits

Author SHA1 Message Date
Sébastien Loriot a05b134a6b add SPDX identifier for files under the boost license 2017-11-12 10:17:50 +01:00
Laurent Rineau 488c3e2879 Merge pull request #2462 from sloriot/CGAL-fix_warnings_g++7 
Fix some warnings
 2017-10-13 17:04:02 +02:00
Laurent Rineau 00d444e84c Merge pull request #2462 from sloriot/CGAL-fix_warnings_g++7 
Fix some warnings
 2017-10-13 16:54:52 +02:00
Laurent Rineau c9cc90e630 Merge pull request #2467 from lrineau/Mesh_2-fix_clusters-GF 
Mesh 2: fix clusters (issue #2456)
 2017-10-11 19:14:33 +02:00
Laurent Rineau 7e9f756935 Replace all std::unary_function by CGAL::unary_function 2017-10-04 15:57:09 +02:00
Laurent Rineau 81662e0c00 More Mesh_2 debug, for clusters 2017-09-26 15:13:53 +02:00
Laurent Rineau a2dd20af02 Bug fix 
Fix #2456

When two clusters share a subsegment, the subsegment is split at its
middle, instead of using the length imposed by the clusters. If the
clusters were partially refined before that subsegment is split, one
must reset the clusters, because the minimal length may have changed.
 2017-09-26 15:13:53 +02:00
Sébastien Loriot c3e7ade8b4 fix warnings 2017-09-25 09:09:54 +02:00
Sébastien Loriot 50510c05ea add include directive for license of all GPL header files 
done using:
ack-grep "^GPL" */package_info/*/license.txt -l | awk -F "/" '{print $1}' > /tmp/gpl_packages
for i in `cat /tmp/gpl_packages | \
          grep -v Operations_on_polyhedra | \
          grep -v Algebraic_kernel_for_circles | \
          grep -v Algebraic_kernel_for_spheres | \
          grep -v Polyhedron_IO`;
do
  echo $i
  python Scripts/developer_scripts/add_license_in_pkg_header.py $i
done
python Scripts/developer_scripts/add_license_in_pkg_header.py Operations_on_polyhedra Polygon_mesh_processing
python Scripts/developer_scripts/add_license_in_pkg_header.py Algebraic_kernel_for_circles Circular_kernel_2
python Scripts/developer_scripts/add_license_in_pkg_header.py Algebraic_kernel_for_spheres Circular_kernel_3
python Scripts/developer_scripts/add_license_in_pkg_header.py Polyhedron_IO Polyhedron
 2017-01-19 15:20:25 +01:00
Sébastien Loriot 19ab4c1907 fix non utf-8 character 2017-01-19 15:20:24 +01:00
Andreas Fabri f9ada57886 Mesh_2: Initialize to avoid warning 2016-11-14 09:14:30 +01:00
Laurent Rineau 3f052834bd Split Mesh_2 
There is a new `Mesher_level` package, that gathers the foundation
files (mesher levels and auxiliary files) for `Mesh_2`,
`Surface_mesher`, and `Mesh_3`.
 2016-09-30 15:23:16 +02:00
Laurent Rineau 51f5697d3d Add missing #include 2016-09-30 15:23:14 +02:00
Laurent Rineau a59084cc79 Fix missing includes 2016-09-30 15:22:26 +02:00
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
Jane Tournois 5e2fab9a51 add verbose stuff 2014-11-12 16:52:49 +01:00
Jane Tournois 89527055bb add update of blind-ness and inside-ness of facets to the optimization function 2014-11-12 15:48:35 +01:00
Jane Tournois e02773efd1 move files about sizing, and change template parameter. Geom_traits is enough 2014-11-12 15:42:27 +01:00
Jane Tournois e971112c1c this file should remain in the demo folder 2014-11-12 13:07:02 +01:00
Jane Tournois d071e71773 move demo "include" code to Mesh_2 "include" code. These files are needed for Lloyd 2014-11-12 12:51:09 +01:00
Jane Tournois 5666a7db17 add code for Lloyd optimization, and in the demo 2014-11-07 17:07:14 +01:00
Jane Tournois d53c211d83 cleaning 2014-11-07 16:16:03 +01:00
Jane Tournois 74581dcb5d do not put constrained vertices in the moving_vertices container 
and add verbose code
 2014-11-07 14:13:17 +01:00
Jane Tournois 6726d84dbc fix compilation when verbose mode is off 2014-11-07 12:20:47 +01:00
Jane Tournois 6ad29f3299 fix border/constrained cases 2014-11-07 12:20:19 +01:00
Jane Tournois ee5c1cea4b add code for optimization. 
- Lloyd move should be ok, but faces blindness is not updated properly until now
- ODT move still needs to be redefined when constraints appear
 2014-10-10 15:37:25 +02:00
Jane Tournois 62098e8445 introduce framework for mesh optimization 
- for now, Lloyd_move and Odt_move return an empty move
- example added
 2014-10-09 13:51:22 +02:00
Jane Tournois 4cf43198e2 dual(v) returns an OutputIterator that collects rays and segments 
to do so, use the Dispatch_output_iterator

- Constrained Voronoi diagram is now a class that has a pointer to a CDT
as member. We don't need an extra CDT anymore
- update examples
- also update the CDT 2 demo to see Voronoi cells, that are only valid when the
triangulation is Delaunay (constrained or not)
 2014-10-07 15:03:41 +02:00
Clement Jamin f3c00442fd Merge branch 'Mesh_3-parallel-cjamin-old' into Mesh_3-parallel-cjamin 2014-05-14 19:05:40 +02:00
Clement Jamin 157cd0465f Merge branch 'Mesh_3-parallel-cjamin-old' into Mesh_3-parallel-cjamin 
Conflicts:
	Mesh_3/demo/Mesh_3/Mesh_3_optimization_plugin_cgal_code.cpp
	Mesh_3/doc/Mesh_3/Concepts/MeshCellBase_3.h
	Mesh_3/include/CGAL/Mesh_3/C3T3_helpers.h
	Mesh_3/include/CGAL/Mesh_3/Mesh_complex_3_in_triangulation_3_base.h
	Mesh_3/include/CGAL/Mesh_3/Mesh_global_optimizer.h
	Mesh_3/include/CGAL/Mesh_3/Sliver_perturber.h
	Mesh_3/include/CGAL/Mesh_3/Slivers_exuder.h
	Mesh_3/include/CGAL/Mesh_3/Triangulation_helpers.h
	Mesh_3/include/CGAL/Mesh_3/config.h
	Mesh_3/include/CGAL/Mesh_3/vertex_perturbation.h
	Mesh_3/include/CGAL/Polyhedral_mesh_domain_3.h
	Mesh_3/include/CGAL/exude_mesh_3.h
	Mesh_3/test/Mesh_3/test_meshing_utilities.h
	Triangulation_3/include/CGAL/Triangulation_cell_base_with_circumcenter_3.h
 2014-03-10 17:01:03 +01:00
Laurent Rineau ecd44ef651 Cosmetic changes 
My coding style has evolved a lot since 2002!
 2014-01-09 14:21:12 +01:00
Laurent Rineau 2c236ff01d Fix a bug in the constructor if Filter_circulator 
The Intel Compiler 14.0, with -O2 or -O3, triggers a bug in the old
version of the code. After the construction of the filtered circulator,
`test(*this)` was not guaranteed. I am not sure if the bug is in the
code or in the compiler, but the constructor was an ugly piece of
code! (*this) was used in the body of the constructor in non obvious
ways. An object is reputed constructed once the internalizers are
evaluated, as far as I know, so probably the previous version of the
code was valid. However, that sound strange to copy an object inside the
body of the constructor of that object. Maybe that confused the
compiler.

Anyway, I have modified the implementation of that constructor in a
cleaner way, and I have added an assertion (that was failing with the
old implementation).
 2014-01-09 14:15:45 +01:00
Clement Jamin 730d34bb23 Create a separate Mesher_level.h file for Mesh_3 
Before, we were using the Mesher_level.h file of the Mesh_2 package,
but the parallel version introduced some changes and a
dependency from Mesh_2 to Mesh_3 that is not wished.
I restored the original Mesher_level.h file in Mesh_2.
 2013-09-11 15:45:55 +02:00
Clement Jamin 138710d997 Remove useless #include 2013-07-25 14:44:01 +02:00
Clement Jamin 206b20bc15 Merge branch 'Mesh_3-parallel-cjamin-old' into Mesh_3-parallel-cjamin 2013-07-02 17:37:50 +02:00
Laurent Rineau ba634e28fd Modularization of Mesh_3::Refine_facets_3 
That class template now has a "base" class, to that is can be refined,
before the CRTP is applied to build the mesher level.
 2013-06-27 17:10:59 +02:00
Clement Jamin bc360c8b13 Changes for GCC compilation + removed some trailing spaces 2013-06-07 17:40:53 +02:00
Clement Jamin dbe1c9c597 Reversed the "facet_not_in_its_cz" variables by removing the "not" 2013-05-28 15:56:22 +02:00
Clement Jamin 127926aa14 Proof-reading + minor changes 
Renamed unlock_all_tls_locked_locations => unlock_all_points_locked_by_this_thread
 2013-05-28 15:07:20 +02:00
Clement Jamin 8745b999ad Replaced is_base_of by is_convertible. 2013-05-22 15:15:05 +02:00
Clement Jamin f2d188c599 Replaced the CGAL_MESH_3_ADD_OUTSIDE_POINTS_ON_A_FAR_SPHERE macro 
Now, we add points on a far spheres by default in the parallel version, but not in the sequential version. So, two macros: CGAL_SEQUENTIAL_MESH_3_ADD_OUTSIDE_POINTS_ON_A_FAR_SPHERE and CGAL_PARALLEL_MESH_3_DO_NOT_ADD_OUTSIDE_POINTS_ON_A_FAR_SPHERE.
 2013-03-15 14:30:35 +01:00
Clement Jamin 462fac46fc No output if no VERBOSE mode activated + class for debugging 
Replaced ExplicitFacet by Explicit_simplex for debugging purpose
 2013-03-14 11:17:04 +01:00
Clement Jamin ce9aba9375 Removed the parallel_for-based and parallel_do-based strategies. 
Just keep the task-scheduler-based strategy, the fastest one.
 2013-03-13 11:23:46 +01:00
Clement Jamin 1f0e994a00 Renamed a few functions + tabs to spaces conversion + benchmark output + minor changes 2013-03-11 15:46:27 +01:00
Clement Jamin 3eae2927e7 Merge branch 'Mesh_3-parallel-cjamin-old' into Mesh_3-parallel-cjamin 2013-03-04 15:50:57 +01:00
Clement Jamin a8d38a5fed Code clean-up 2013-02-28 19:46:06 +01:00
Andreas Fabri 876a4a5753 remove unused variables and #if 0 buggy non used code 2013-02-26 17:05:13 +01:00
Laurent Rineau 66c5d23154 Use CGAL_assume to remove warnings 2013-02-20 18:55:43 +01:00
Clement Jamin 8d5352e15f Better grid lock data structure. 
There is just one grid lock data structure class now, with several specialization.
Moreover, now the type of the lock data structure is only defined in the triangulation.
 2013-02-18 12:58:57 +01:00
Clement Jamin bce43fbb8e Improved the way parallelism is handle in Mesh_3/Triangulation_3 
Added a better support for parallelism in Triangulation_3.
Simplified how to enable/disable concurrency in Mesh_3.
Moved the Compact_container stategies to a new file.
 2013-02-15 18:07:43 +01:00
Clement Jamin 70312d7299 Code clean-up 2013-02-13 19:57:01 +01:00