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
7c03566d5a
fix unused variable warning
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
07bd45535c
fix typo
2015-05-19 08:54:35 +02:00
Jane Tournois
27ec7dd5db
add the macros easily available and comment them
2015-05-19 08:54:35 +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
f2e7a860de
fix link
2015-05-19 08:54:34 +02:00
Jane Tournois
5e9773f390
fix link to Mesh_optimization_return_code from Mesh_3
2015-05-19 08:54:34 +02:00
Jane Tournois
d3201da788
fix Laurent's email address
2015-05-19 08:54:34 +02:00
Jane Tournois
7886aca9e4
add a typedef
2015-05-19 08:54:33 +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
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
Andreas Fabri
625f9f6cd7
after git merge remotes/origin/hot-fixes-for-Git
2012-11-20 13:02:17 +01:00
Sébastien Loriot
2607d8b7b9
missing { and extra latex
2012-11-19 16:32:51 +01:00
Sébastien Loriot
128b02abb8
update CGAL custom doxygen macros
...
corresponds to a run of the script Documentation/conversion_tools/rename_macros.sh
+manual edit of doxyassist.xml and pkglist_filter.py
2012-11-14 00:31:05 +01:00
Sébastien Loriot
5ee1081f92
using cgal macros for all figures
2012-11-08 17:17:29 +00:00
Sébastien Loriot
0e2b61845c
replace markup #, ##, ### by \section, \subsection and \subsubsection
...
(manual replacement)
2012-11-06 22:24:02 +00:00
Sébastien Loriot
ae159cbdf3
replace markup #, ##, ### by \section, \subsection and \subsubsection
...
(script replacement)
2012-11-06 22:02:15 +00:00
Andreas Fabri
6abaad0be3
No need for :: as prefix in backquotes
2012-10-31 20:52:33 +00:00
Clément Jamin
3ff6969e63
Had forgotten to remove this temporary code
2012-10-25 12:00:37 +00:00
Philipp Möller
31a3c07418
Turn \refines :: into \refines `X` globally
2012-10-25 09:48:39 +00:00
Philipp Möller
31e9eadf8b
Fix all PackageDescriptions to a newer layout
2012-10-19 15:52:31 +00:00
Laurent Rineau
3ee271ea18
Add documentation that Projection_traits_xy_3 is a model of
...
DelaunayMeshTraits_2
2012-10-16 14:53:13 +00:00
Laurent Rineau
b4c3b341ba
Make Projection_traits_3 compatible with Mesh_2
...
And add one test.
2012-10-16 14:46:46 +00:00
Clément Jamin
1ca7174e01
Merge from Mesh_3-improvements-GF
...
+ some bugfixes (most of them are related to the parallel version)
This version works (sequential and parallel) as long as the following macros are NOT defined:
* CGAL_COMPACT_MESH_VERTEX_CELL
* CGAL_INTRUSIVE_LIST
* FORCE_STRUCTURAL_FILTERING
2012-10-16 14:02:16 +00:00
Clément Jamin
4e1f8aa4f8
Merge from next
2012-10-15 08:28:01 +00:00
Laurent Rineau
795c71fc9b
Fix headers of Mesh_2 and Mesh_3. All were missing #include.
...
I found out that way that <CGAL/Mesh_3/Refine_facets.h> and
<CGAL/Mesh_3/Protect_edges_sizing_field> were using global functions
instead of functors of the traits class.
Note also the funny bug that <CGAL/Regular_triangulation_cell_base_3.h> was
depending on <CGAL/Triangulation_vertex_base_3.h>!
2012-10-08 09:33:38 +00:00
Laurent Rineau
0a081c2abd
Add an option to check the syntax of headers, individually.
...
That feature can be enabled with g++, clang++, and icpc (intel). It could
be implemented for MSVC, with the flag /Zs, but that is not yet done (and
probably will not).
The option is controlled by a CMake option, CGAL_ENABLE_CHECK_HEADERS, that
is disabled by default. If that option is enabled by the user, then CMake
will check if the compiler $CXX understand the syntax:
$CXX -x c++ -fsyntax-only CGAL/header.h
and send an error otherwise.
Then phony targets will be created:
- a target check_CGAL__header_h for each header <CGAL/header.h>,
- a target check_pkg_<pkg> for each package <pgk>,
- and a target check_headers for the whole CGAL.
Those new targets currently give a lot of compilation errors if
CGAL_ENABLE_CHECK_HEADERS is enabled!
+ fix several missing includes in Mesh_2.
2012-10-05 12:21:44 +00:00
Laurent Rineau
ac31600c60
Mesh_2 documentation verify by the author
...
Remove the \todo
2012-10-04 08:09:52 +00:00
Laurent Rineau
b4ab505a42
Fix syntax
...
- de-LateXify the parameter names,
- avoid `quotes` on more than two lines.
2012-10-03 13:20:36 +00:00
Laurent Rineau
c5ee6400c1
Use lists in the description of MeshingCriteria_2::Is_bad.
...
That is infinitely better than with the LaTeX manual tools!
2012-10-03 13:06:50 +00:00
Laurent Rineau
44d051d631
Uniformly s/SqrtFieldNumberType/FieldWithSqrt/g
...
SqrtFieldNumberType is no longer documented. (For how long?)
I have also rephrase "A `SqrtFieldNumberType`" to "A model of the
`SqrtFieldNumberType` concept", that sounds more correct.
2012-10-03 12:10:00 +00:00
Laurent Rineau
d84e60c1f6
Typo in a return type
2012-10-03 12:04:17 +00:00
Andreas Fabri
16992d9713
change link for \ccDepends
2012-10-03 11:00:43 +00:00
Philipp Möller
37778547bf
Fix example to point to paths similar to a flat layout
2012-10-01 18:02:44 +00:00
Clément Jamin
2366fee1e1
Merge from next
2012-09-28 14:51:02 +00:00
Philipp Möller
9d96057636
Add PkgDependsOn to the package summary
2012-09-27 11:13:37 +00:00
Philipp Möller
b64ba48134
The changes to move the package overview labels into the
...
PackageDescription.
2012-09-25 17:17:49 +00:00
Philipp Möller
e54098fb57
Throw out left over Classified files and move their content if
...
necessary.
2012-09-20 16:29:19 +00:00
Philipp Möller
1954eff3d6
* build normalized mainpage anchors
...
* better naming for Pkg commands
* User and Reference Manual links from the PackageOverview
2012-09-20 15:30:03 +00:00
Philipp Möller
1b3a78a08f
Salvage the demo information from the old package description.
2012-09-20 13:30:49 +00:00
Andreas Fabri
6f61e2b2ee
Downsize headings
2012-09-17 14:53:05 +00:00
Philipp Möller
864aebe2e5
Merge next.
...
This commit also updates the respective mock-headers when the
corresponding .tex documentation has changed. This has been the case for:
AABB_tree/doc_tex/AABB_tree_ref/AABBGeomTraits.tex
AABB_tree/doc_tex/AABB_tree_ref/AABBTraits.tex
AABB_tree/doc_tex/AABB_tree_ref/AABB_traits.tex
Mesh_3/doc_tex/Mesh_3_ref/parameters_features.tex
Mesh_3/doc_tex/Mesh_3_ref/parameters_no_features.tex
Number_types/doc_tex/NumberTypeSupport_ref/Interval_nt.tex
Number_types/doc_tex/NumberTypeSupport_ref/Lazy_exact_nt.tex
Spatial_searching/doc_tex/Spatial_searching_ref/Search_traits_2.tex
Spatial_searching/doc_tex/Spatial_searching_ref/Search_traits_3.tex
Triangulation_2/doc_tex/Triangulation_2_ref/Constrained_Delaunay_triangulation_2.tex
2012-09-12 14:14:22 +00:00
Clément Jamin
23ff0b1012
Oops, bugfix on my previous bugfix
2012-08-31 08:41:47 +00:00
Clément Jamin
e401dd9175
Bugfix (see comment in Mesher_level.h)
2012-08-31 08:30:14 +00:00
Laurent Rineau
90820a8c50
Fix those warnings:
...
Mesh_2.txt:87: warning: unable to resolve reference to `Mesh_2/conforming.cpp' for \ref command
Mesh_2.txt:247: warning: unable to resolve reference to `Mesh_2/mesh_global.cpp' for \ref command
Mesh_2.txt:258: warning: unable to resolve reference to `Mesh_2/mesh_class.cpp' for \ref command
Mesh_2.txt:270: warning: unable to resolve reference to `Mesh_2/mesh_with_seeds.cpp' for \ref command
2012-08-30 15:11:40 +00:00
Laurent Rineau
a03de5b89d
Fix warnings
2012-08-30 14:58:56 +00:00
Philipp Möller
2d8931167f
autoexamples
2012-08-29 16:20:55 +00:00
Philipp Möller
5a0a5403c4
Enable autotoc on mainpages
2012-08-29 15:45:17 +00:00
Andreas Fabri
55611632bf
link free functions by prefixing with ::
2012-08-29 13:47:40 +00:00
Andreas Fabri
1888469bda
/</I> -> </I>; %Default
2012-08-29 08:54:08 +00:00
Philipp Möller
e2616dafb1
Rebuild the how_to_cite structure
2012-08-28 17:33:45 +00:00
Andreas Fabri
0e1f9b775f
Put several small images side by side
2012-08-28 13:50:54 +00:00
Andreas Fabri
dc33da0804
fix linking in \has Models by backquoting and prefixing with CGAL namespace
2012-08-27 09:05:23 +00:00
Laurent Rineau
2db4effa7e
CMake: Fix the handling of cmake_policy
...
That is a followup-to my commit last year:
| ------------------------------------------------------------------------
| r63198 | lrineau | 2011-04-28 19:45:22 +0200 (Thu, 28 Apr 2011) | 5 lines
|
| Try to fix my last revision about cmake_policy, with CMake-2.6.x
|
| CMake gives an error if one tries to use cmake_policy(VERSION x.y.z) if
| x.y.z is greater than the current CMake version.
|
| ------------------------------------------------------------------------
The following check:
if("${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}" VERSION_GREATER 2.6)
is useless just after a call to:
cmake_minimum_required(VERSION 2.6.2)
The script used to fix that was:
#!/usr/bin/env perl
$replacement=<<'END';
if("${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}.${CMAKE_PATCH_VERSION}" VERSION_GREATER 2.8.3)
cmake_policy(VERSION 2.8.4)
else()
cmake_policy(VERSION 2.6)
endif()
END
while(<>) {
if(/if\("\${CMAKE_MAJOR_VERSION}.\${CMAKE_MINOR_VERSION}" VERSION_GREATER 2.6\)/) {
while(<>) {
if(/^endif\(\)/) {
print "$replacement";
while(<>) {
print;
}
exit 0
}
}
}
print;
}
2012-08-22 12:35:03 +00:00
Andreas Fabri
d2f647f8c6
\require -> \requires
2012-08-21 13:24:01 +00:00
Andreas Fabri
af87732f6a
Add \anchor of chapters
2012-08-21 10:18:58 +00:00
Philipp Möller
d3a9a641de
Refurb package descriptions with a label for the license.
2012-08-20 14:28:36 +00:00
Philipp Möller
46999aaa09
Linking to Face_badness
2012-08-17 12:52:40 +00:00
Andreas Fabri
db7971d0ec
no whitespace before .
2012-08-17 11:59:41 +00:00
Philipp Möller
c80da3b032
Use new layout
2012-08-16 17:12:26 +00:00
Philipp Möller
4a24b439f4
Layouting and package building changes
...
Fiddle with the master doxygen file, improve package overview
building, add a set of packages to the doxyassist XML, fix up
straggling packages that didn't have those changes
2012-08-08 09:21:40 +00:00
Philipp Möller
e65a8028ea
Replace tex-style quotes with quotes that you would expect, as there
...
is no way to handle them in the converter.
Needs to be revert before this is being merged into next.
2012-08-02 12:55:15 +00:00
Laurent Rineau
db194534c7
First big patch to fix -Wunused-local-typedefs
...
-Wunused-local-typedefs is a new warning flag of gcc-4.7, and it will enabled
by -Wall since gcc-4.8 (not yet released).
The fix is a big set of removals of unused typedefs (or comments, or moves,
depending on the context).
2012-08-01 13:29:16 +00:00
Philipp Möller
ebe9072d1d
Testwise STL_Extension + Mesh_2
2012-07-27 18:45:02 +00:00
Philipp Möller
495fac8ea1
Merge from next
2012-07-27 17:58:52 +00:00
Laurent Rineau
fcd8565b46
Revert a buggy revision
...
Bug reported by a user against CGAL-4.0.2
A single triangle cannot be meshed!
The fault was a buggy assertion added in the following revision:
|-----------------------------------------------------------------------
|r66359 | lrineau | 2011-11-16 18:58:22 +0100 (Wed, 16 Nov 2011) | 3 lines
|
|Add an assertion that checks that a point constructed as the midpoint of an
|edge is located either on the edge or inside one of the two incident faces.
|
|-----------------------------------------------------------------------
And the assertion message was:
terminate called after throwing an instance of 'CGAL::Assertion_exception'
what(): CGAL ERROR: assertion violation!
Expr: zone.locate_type != Tr::FACE || zone.fh == f || zone.fh == n
File: /home/lrineau/wc/Mesh_2/test/Mesh_2/../../include/CGAL/Mesh_2/Refine_edges.h
Line: 430
Explanation: Your data set contains at least a vertex that is very close to
a constrained edge! Mesh_2 cannot mesh that sort of data set.
2012-07-26 14:02:13 +00:00
Clément Jamin
fc40c96c3d
For GCC
2012-07-11 10:11:31 +00:00
Clément Jamin
1c664776c9
The parallel version can now be built with GCC
2012-07-10 16:53:34 +00:00
Clément Jamin
41f9cbe411
Sequential Mesh_3 can now be compiled by GCC.
2012-07-09 15:44:58 +00:00
Clément Jamin
40f602fea9
Minor changes (comments, etc.)
2012-06-21 12:03:03 +00:00
Philipp Möller
b529971917
Merge the changes to ccPrecond and ccPostcond that have been in
...
features/doxy-pmoeller and add changes for ccRequires on top of it.
ATTN: This changeset should be unmerged before the whole branch goes
back into next.
2012-06-20 13:57:36 +00:00
Clément Jamin
d42a0fc71d
Improved tag dispatching
2012-06-20 13:04:40 +00:00
Clément Jamin
3725168185
Backup commit (I need to roll back to an older version)
2012-06-15 11:28:09 +00:00
Laurent Rineau
b62a301153
Test the undocumented function refine_Delaunay_mesh_2_without_edge_refinement
...
It seems that OpenSCAD uses that function. It had a compilation error with
g++-4.7 (the patch is already in next).
2012-06-14 13:17:41 +00:00
Clément Jamin
78cddbe55b
bugfix
2012-06-13 10:04:23 +00:00
Clément Jamin
b268598665
Replace LINKED_WITH_TBB by CGAL_LINKED_WITH_TBB.
2012-06-13 09:33:08 +00:00
Clément Jamin
b948543cc6
Use of a Tag (template parameter) to activate/deactivate concurrency in Mesh_3, instead of #ifdef macros.
2012-06-09 08:52:37 +00:00
Clément Jamin
dfbddff185
Bugfixes + some clean-up
2012-05-30 14:49:02 +00:00
Laurent Rineau
fd77f801dc
Bug fix: g++-4.7 (and C++03/11) requires to qualify the call.
2012-05-21 06:53:58 +00:00
Clément Jamin
d2792dff8d
- Added the ability to add points on a sphere outside the domain in the sequential case => better performance for the fandisk model (x2). I'm still wondering why...
...
- Code refactoring/clean-up
2012-05-04 15:20:28 +00:00
Clément Jamin
9da17676e9
Clean-up / formatting
2012-05-03 16:37:48 +00:00
Clément Jamin
5a628edd4e
- New worksharing technique: we use a coarse version of the mesh to split the space.
...
- Some clean-up (removed g_global_mutex)
2012-05-03 16:05:36 +00:00
Clément Jamin
107a428fb5
- Added the ability to sort work batches according to quality, in order to reduce the number of inserted vertices
...
- Modified config parameters manager (Concurrent_mesher_config class)
2012-05-02 15:21:31 +00:00
Clément Jamin
0eee3dc040
Fixed a deadlock introduced recently.
...
Added some assertions in the way...
2012-04-25 13:00:12 +00:00
Clément Jamin
fb7d171271
Oops. Forgot to remove a line.
2012-04-24 16:01:54 +00:00
Clément Jamin
107b268756
- Now, we first start by a little bit of sequential refinement, in order to get a better approximation of the bounding box
...
- New worksharing strategy, which groups tasks by batches and let TBB manage the load balancing => the results are slightly improved, compared to parallel_do
- New params in config file
2012-04-24 15:06:10 +00:00
Clément Jamin
fc121a451d
- Some clean-up
...
- Function get_number_of_bad_elements in the mesher levels (for debugging)
- option CGAL_MESH_3_ADD_OUTSIDE_POINTS_ON_A_FAR_SPHERE to reduce contention on the infinite vertex
2012-04-24 07:59:29 +00:00
Clément Jamin
9492b2eb84
Added the option to sort the refinement queue after the initial scans (facets and cells), when the queue is an unsorted container.
2012-04-20 09:45:58 +00:00