Commit Graph

54798 Commits

Author SHA1 Message Date
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 4b71328474 change vertex base in demo to use my last commit 2014-11-14 13:40:30 +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 bd0917d7a9 little cleaning 2014-11-13 17:20:21 +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 76c8e95389 add input dialogs to demo to be able to set Delaunay refinement parameters
k-Lipschitz case
2014-11-12 16:26:44 +01:00
Jane Tournois f084954892 add input dialogs to demo to be able to set Delaunay refinement parameters 2014-11-12 16:16:03 +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 e24ea9175a fix bug : we should not have 2 default constructed rays in every CVD cell 2014-11-07 14:08:57 +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 1e1d6b9004 add menu to tag blind faces 2014-11-06 16:03:41 +01:00
Jane Tournois b29a041c00 fix functions that tag faces as blind 2014-11-06 16:03:17 +01:00
Jane Tournois a4c3691763 add code to demo to display bad facets 2014-11-06 15:34:48 +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 84ca2d460b add functionalities to CVD cells 2014-10-09 16:58:35 +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 2d007d3bf2 fix macro's name 2014-10-09 13:48:55 +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
Jane Tournois 8d87ccf8c2 add a dual(vertex) function to DT2 and CDT2
- in DT2, it returns the Voronoi cell as a Polygon_2
- in CDT2, it returns the - possibly clipped - "bounded Voronoi cell"
see Seidel1988 or http://hal.inria.fr/docs/00/54/68/79/PDF/centroidal-vd.pdf

also add an example that computes the full BVD
2014-10-03 16:52:48 +02:00
Jane Tournois e97506adb7 Merge branch 'Triangulation_3-regular_cell_base_with_circumcenter-GF'
Resolve conflicts in Mesh_3/include/CGAL/Mesh_3/config.h

This branch implements the small feature described here :
https://cgal.geometryfactory.com/CGAL/Members/wiki/Features/Small_Features/circumcenter%28%29_in_RT3_cell_base

It makes consistent implementations of dual(cell) in RT3 and DT3 :
they both return cell->circumcenter(gt) now

Approved by the release manager
2014-05-13 14:52:13 +02:00
Jane Tournois 8bc6e6136d fix a warning from clang. Actually highlighted a real error : gt was missing 2014-05-12 14:55:11 +02:00
Laurent Rineau 80ec1ff80b Merge branch 'Mesh_3-fix_Mesh_3_CGAL_4.3-lrineau'
Fix bugs introduced in CGAL-4.3.

Tested in CGAL-4.5-Ic-35

Approved by the release manager
2014-05-12 14:42:40 +02:00
Laurent Rineau 3c3b0a013a Fix expected number of cells 2014-05-12 14:41:36 +02:00
Jane Tournois 1b5f70c871 fix deprecation warning 2014-05-12 12:57:33 +02:00
Laurent Rineau 3224c40861 Fix the number of inserted balls
With CGAL_MESH_3_NO_PROTECTION_NON_LINEAR==1, the number of protecting
balls is higher.
2014-05-09 10:49:19 +02:00
Laurent Rineau 33cb60cc29 Revert an incorrect push I did 2014-05-07 15:18:53 +02:00
Laurent Rineau 8c41940615 Update the release notes 2014-05-07 14:01:17 +02:00
Laurent Rineau bcefbcb8bd Merge remote-tracking branch 'origin/Periodic_3_mesh_3-Extended_mesh_3-MBogdanov' into Periodic_3_mesh_3-Extended_mesh_3-MBogdanov 2014-05-07 13:56:27 +02:00
Laurent Rineau 68c367a2df Revert "Revert "Merge branch 'Periodic_3_mesh_3-Extended_mesh_3-MBogdanov'""
This reverts commit 2e58135751.
2014-05-07 13:56:20 +02:00
Marc Glisse 89dd491a17 Merge remote-tracking branch 'origin/Number_types-Interval_with_long-glisse'
Remove explicit interoperability between Interval_nt and int, so
Interval_nt becomes interoperable with every builtin type (in particular
long) via double.

Approved by the release manager
2014-05-07 13:19:24 +02:00
Marc Glisse dc533b4b01 Merge remote-tracking branch 'origin/Number_types-Gmpq_less_boost-glisse'
Implement Gmpq+Gmpq directly instead of going through boost, to simplify
the generated code.

Approved by the release manager
2014-05-07 13:18:23 +02:00
Marc Glisse be533936fc Merge remote-tracking branch 'origin/STL_Extension-Handle_for_micro_opt-glisse'
Micro-optimization in the constructors of Handle_for.

Approved by the release manager
2014-05-07 13:17:11 +02:00
Laurent Rineau 57050c3470 Fix another bug introduced in CGAL-4.3
An assertion was added, but that assertion cannot work if the set of
initial points is collinear (dimension 1).
2014-05-07 12:05:43 +02:00
Laurent Rineau de44fdf27e Fix a bug introduced in CGAL-4.3
The Mesh_3 experimental feature "PROTECTION_NON_LINEAR" was not
correctly disabled when the development branch of Mesh_3 was merged into
CGAL-4.3.
2014-05-07 12:05:43 +02:00
Sébastien Loriot 8aa67dcfa4 add missing const in doc 2014-05-06 16:03:51 +02:00
Marc Glisse e5113a2c37 Don't use Boost.Operators for +-*/ of Gmpq.
It shouldn't change the performance significantly (the time is spent in
malloc/free and the mpq_* calls), but at least I can follow the
(smaller) generated code.
2014-05-05 20:06:22 +02:00
Marc Glisse 24d396afb2 Micro-optimization: do the opaque call first so it does not hinder optimizers.
(don't expect to measure the difference)
2014-05-05 19:13:31 +02:00
Marc Glisse b8bab2041a Remove the mixed Interval_nt x int operations. They are useless and
cause ambiguity with the double operations.
2014-05-05 18:19:08 +02:00
Sébastien Loriot 276f2ce4e7 trivial bug-fix for master to export link targets for an external plugin 2014-04-30 15:18:11 +02:00