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
7870b54c06
add figures to the documentation
2015-05-19 08:54:15 +02:00
Guillaume Damiand
9c78897ba5
Merge branch 'CGAL_headers_only-gdamiand_cjamin-old' into CGAL_headers_only-gdamiand_cjamin
2015-03-16 14:00:43 +01:00
Jane Tournois
2b7d774c36
fix the convergence criterion
2014-11-28 12:59:31 +01:00
Jane Tournois
c83641b7ef
fix sections : meshing examples of "meshes" back in the "Meshes" section
2014-11-28 09:53:00 +01:00
Jane Tournois
f1afe6a2ef
add documentation for lloyd_optimize_mesh_2
2014-11-27 16:23:55 +01:00
Jane Tournois
33dd5d441d
update package description
2014-11-27 13:22:00 +01:00
Jane Tournois
3cced7e6fc
make the example simpler for the documentation
2014-11-27 13:21:04 +01:00
Jane Tournois
0d90d763c1
add a link to lloyd_optimize_mesh_2
2014-11-27 13:11:28 +01:00
Jane Tournois
fbd42eb3b4
list of examples updated
2014-11-27 13:10:38 +01:00
Jane Tournois
4661c6765f
remove using namespace parameters from example to make documentation clearer
2014-11-27 13:04:43 +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
8532b75851
add a test for lloyd_optimize_mesh_2
2014-11-24 17:01:40 +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
Guillaume Damiand
ebc4300334
Header only for random.cpp.
...
For the header only version, the global variable default_random no more exist => we need to replace all occurences of default_random by a call to the global function get_default_random().
As usual, no modification for the non header only version.
2014-11-14 14:20:26 +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
Sébastien Loriot
0fa2cacb60
remove doc_tex documentation (including developer manual) and old manual tools
2013-12-03 17:27:02 +01:00
Clement Jamin
ec8e949d21
Merge branch 'Mesh_3-parallel-cjamin-old' into Mesh_3-parallel-cjamin
2013-11-21 10:50:55 +01:00
Laurent Rineau
38e5dc102d
Remove execution permissions
2013-11-13 14:05:43 +01:00
Clement Jamin
41929ed520
Merge branch 'Mesh_3-parallel-cjamin-old' into Mesh_3-parallel-cjamin
...
Conflicts:
Mesh_3/doc/Mesh_3/Concepts/MeshCellBase_3.h
Mesh_3/dont_submit
Triangulation_3/doc/TDS_3/CGAL/Triangulation_data_structure_3.h
Triangulation_3/doc/TDS_3/Concepts/TriangulationDataStructure_3.h
Triangulation_3/doc/Triangulation_3/CGAL/Delaunay_triangulation_3.h
Triangulation_3/doc/Triangulation_3/CGAL/Regular_triangulation_3.h
Triangulation_3/doc/Triangulation_3/CGAL/Triangulation_3.h
Triangulation_3/doc/Triangulation_3/PackageDescription.txt
2013-09-25 11:47:43 +02: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
Sébastien Loriot
e8975dbac7
function documentation fixes
...
remove the repetition of the name of the function in its brief description
add parenthesis for function matching "function\s+`[a-z0-9_]`"
2013-09-03 14:25:50 +02:00
Laurent Rineau
bc03aaf30b
Put doc/ in the global dont_submit file
2013-08-20 10:57:03 +02:00
Sébastien Loriot
d282ade623
use \cgalCite instead of \cite
...
using perl -i -pe 's/\\cite\s*{?([a-zA-Z0-9:-]+)}?/\\cgalCite{$1}/g'
2013-08-05 18:25:26 +02:00
Sébastien Loriot
b2ef3b8673
Merge branch 'doc-remove_gif-local'
...
Successfully test in CGAL-4.3-Ic-102
This commit fixes a few issues in the doxygen documentation and in particular
the figure for the generation of latex doc.
Approved by the interim release manager
xplain why this merge is necessary,
2013-07-26 17:50:07 +02:00
Sébastien Loriot
2dfe8a3d73
workaround for a doxygen bug: remove space after /!* to avoid a verbatim env
...
this happens if you have an empty line or the text directly after /!*
to find them in the generated documentation, grep for "pre class=\"fragment\""
(a few of them are legitimate however)
2013-07-25 14:58:53 +02:00
Clement Jamin
138710d997
Remove useless #include
2013-07-25 14:44:01 +02:00
Sébastien Loriot
519b301130
remove gif files from doxygen doc include path
2013-07-25 11:14:16 +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
Sébastien Loriot
716f87d2d7
rename Hidden_type to unspecified_type and update its description
2013-06-13 18:48:58 +02:00
Clement Jamin
bc360c8b13
Changes for GCC compilation + removed some trailing spaces
2013-06-07 17:40:53 +02:00
Ross Hemsley
4d9caf3763
Added names that were missing into the Doxyfile.in entries.
...
Also modified Installation/CMakeLists.txt to push the version number variable to the parent level
so that it can be accessed by the documentation
2013-05-30 17:55:43 +02:00
Philipp Möller
4d469821f7
Generated Doxyfile.in and dependencies
2013-05-30 14:13:47 +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
Sébastien Loriot
7e59c14580
add a header to classified reference pages using a doxygen macro
2013-03-12 14:33:49 +01:00
Sébastien Loriot
7a6aa123d7
add classified reference manual for Mesh_2
2013-03-12 13:36:15 +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
2d8da664a3
Merge branch 'CGAL-fix_warnings-gdamiand'
...
Conflicts:
.gitignore
Skin_surface_3/examples/Skin_surface_3/CMakeLists.txt
2013-02-22 13:02:37 +01:00
Laurent Rineau
66c5d23154
Use CGAL_assume to remove warnings
2013-02-20 18:55:43 +01:00
Laurent Rineau
26a7e70785
New license.txt files (eol changes)
...
The new version 2.13.0 of licensecheck has changed the spaces at eol.
2013-02-19 16:46:39 +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
Clement Jamin
eb2ed63d8b
Changed the way we activate concurrency in Triangulation_3 + Code clean-up
2013-02-11 19:12:30 +01:00
Clement Jamin
c4859681e3
Removed the "localization ids" related code.
...
It was an old, unused and slow.
2013-02-06 18:57:36 +01:00
Andreas Fabri
9fea4e7c99
one less warning in Mesh_2, Point_set_2
2013-01-30 18:49:40 +01:00
Sébastien Loriot
5ec28b1cf4
replacing the usage of section in user man by \cgalHeading macro call
2013-01-07 18:04:37 +01:00
Andreas Fabri
0ee845a9cc
polish Mesh_2
2012-12-27 20:58:17 +01:00
Philipp Möller
75f69570dc
Change the titles of mainpages to "User Manual"
...
This leads to a slightly odd result in the search for "User Manual",
but makes the pages themselves more consistent.
2012-12-13 14:47:09 +01:00
Sébastien Loriot
9576be3c3b
add doc in dont_submit
2012-11-27 08:42:02 +01:00
Sébastien Loriot
920eb63882
backporting documentation changes of master@9fcc5b57 into doxy-port-pmoeller
...
Conflicts:
Arrangement_on_surface_2/doc/Arrangement_on_surface_2/CGAL/Arr_linear_traits_2.h
Installation/doc_tex/Installation/usage.tex
Kernel_23/doc/Kernel_23/CGAL/Projection_traits_xy_3.h
Mesh_2/doc/Mesh_2/Concepts/ConformingDelaunayTriangulationTraits_2.h
Spatial_searching/doc/Spatial_searching/CGAL/Incremental_neighbor_search.h
Spatial_searching/doc/Spatial_searching/CGAL/K_neighbor_search.h
Spatial_searching/doc/Spatial_searching/CGAL/Orthogonal_incremental_neighbor_search.h
2012-11-23 22:54:31 +01:00
Sébastien Loriot
9c79cb5c7f
backport commit in tex file from master into doxygen
2012-11-23 18:16:59 +01:00
Sébastien Loriot
6cc7d66415
Revert "Replace tex-style quotes with quotes that you would expect, as there"
...
This reverts commit e65a8028ea .
Conflicts:
Approximate_min_ellipsoid_d/doc_tex/Bounding_volumes_ref/Approximate_min_ellipsoid_d.tex
Approximate_min_ellipsoid_d/documentation/mel.tex
Documentation/doxyassist.xml
Installation/doc_tex/Installation/usage.tex
Min_sphere_of_spheres_d/doc_tex/Bounding_volumes_ref/MinSphereOfSpheresTraits.tex
Optimisation_doc/doc_tex/Bounding_volumes/user_part.tex
Optimisation_doc/doc_tex/Inscribed_areas/user_part.tex
Width_3/doc_tex/Polytope_distance_d_ref/Width_3.tex
2012-11-23 18:08:13 +01:00
Sébastien Loriot
7cd0e93fa9
Revert "Merge the changes to ccPrecond and ccPostcond that have been in"
...
This reverts commit b529971917 .
Conflicts:
Approximate_min_ellipsoid_d/doc_tex/Bounding_volumes_ref/Approximate_min_ellipsoid_d.tex
Matrix_search/doc_tex/Polytope_distance_d_ref/spec_all_furthest_neighbors.tex
Min_annulus_d/doc_tex/Bounding_volumes_ref/Min_annulus_d.tex
Min_circle_2/doc_tex/Bounding_volumes_ref/Min_circle_2.tex
Min_ellipse_2/doc_tex/Bounding_volumes_ref/Min_ellipse_2.tex
Min_quadrilateral_2/doc_tex/Bounding_volumes_ref/spec_oops.tex
Min_sphere_d/doc_tex/Bounding_volumes_ref/Min_sphere_d.tex
Min_sphere_of_spheres_d/doc_tex/Bounding_volumes_ref/MinSphereOfSpheresTraits.tex
Min_sphere_of_spheres_d/doc_tex/Bounding_volumes_ref/Min_sphere_of_spheres_d.tex
Surface_mesh_parameterization/doc_tex/Surface_mesh_parameterization_ref/Taucs_matrix.tex
Surface_mesh_parameterization/doc_tex/Surface_mesh_parameterization_ref/Taucs_symmetric_matrix.tex
Triangulation_2/doc_tex/Triangulation_2_ref/Constrained_triangulation_2.tex
Width_3/doc_tex/Polytope_distance_d_ref/Width_3.tex
2012-11-23 18:04:33 +01:00
Andreas Fabri
3447d93aa2
typo
2012-11-23 11:46:13 +01:00
Andreas Fabri
8d3c6a9bb9
polish Mesh_2
2012-11-23 11:44:39 +01:00
Sébastien Loriot
ae8362b7d6
replace \cgalModels ::FOO by \cgalModels `FOO`
...
using:
perl -pi -e 's/\\cgalModels\s+::([A-Za-z0-9_:]+)\s*$/\\cgalModels `$1`\n/'
2012-11-23 09:37:53 +01:00
Clément Jamin
62c6484110
Merge remote-tracking branch 'remotes/origin/hot-fixes-for-Git' into Mesh_3-parallel-cjamin
2012-11-21 12:23:42 +01:00
Clément Jamin
4f262b956a
Clean-up TODOs
2012-11-20 15:00:32 +01:00