404f2e0e3c
merge
2013-06-21 10:01:19 +01:00
8d602ed8c2
Merge branch 'triangulation_3-copy_tds-sloriot'
...
Approved by the release manager
Conflicts:
Alpha_shapes_3/test/Alpha_shapes_3/copy_tds.h
Triangulation_2/doc/TDS_2/Concepts/TriangulationDataStructure_2.h
it introduces a more general copy_tds that allows to copy tds with different types of simplices.
2013-04-29 11:09:01 +02:00
498492e770
add set_infinite_vertex to Triangulation_3 and use it with copy_tds
...
the 2D version already exists
2013-04-12 16:04:59 +02:00
35120cdf53
small feature documentation about inexact_locate
2013-03-22 15:46:38 +01:00
bc7e2a1d71
Merge remote-tracking branch 'origin/Mesh_3-improvements-GF' into Mesh_3-improvements-GF-new
...
Mesh_3-improvements-GF-new is fresh fork of master
Conflicts:
.gitattributes
AABB_tree/include/CGAL/AABB_tree.h
GraphicsView/src/CGAL_Qt4/DemosMainWindow.cpp
Mesh_3/include/CGAL/Mesh_3/C3T3_helpers.h
Mesh_3/include/CGAL/Mesh_3/Refine_facets_3.h
Mesh_3/include/CGAL/Polyhedral_mesh_domain_3.h
2013-02-28 17:10:16 +01:00
8b5b56adb1
make index an unsigned int
2013-02-15 11:30:08 +01:00
afeea1e124
replace size_t with int in loops over the vertices of a cell
2013-02-07 17:26:32 +01:00
7d169b85f8
r70573 from Mesh_3-experimental-GF
...
add macro to force Structural_filtering
2012-07-31 14:14:25 +00:00
db9f968ea9
r70321 from Mesh_3-experimental-GF
...
Change inexact_locate and inexact_orientation from protected to public (needed for the commit in Mesh_3 concerning inexact_locate in Mesh_sizing_field)
2012-07-31 13:30:29 +00:00
95bec3999c
Use Unique_has_map instead of std::map (patch from Andreas Fabri)
...
The gain on copies of T2 or T3 is the following:
afabri@klimt /cygdrive/c/cgal/next/Triangulation_3/benchmark/Triangulation_3
$ ./copy 1000000 2
36.806 sec
afabri@klimt /cygdrive/c/cgal/next/Triangulation_3/benchmark/Triangulation_3
$ ./copy 1000000 2
4.865 sec
The benchmarck copy.cpp is the following (not commited):
#define CGAL_T3_HASH
#include <CGAL/Exact_predicates_inexact_constructions_kernel.h>
#include <CGAL/Delaunay_triangulation_3.h>
#include <CGAL/Timer.h>
#include <CGAL/point_generators_3.h>
#include <iostream>
#include <fstream>
#include <string>
#include <vector>
typedef CGAL::Exact_predicates_inexact_constructions_kernel K;
typedef CGAL::Delaunay_triangulation_3<K> Delaunay;
typedef K::Point_3 Point;
typedef CGAL::Creator_uniform_3<double,Point> Creator;
int main(int argc, char **argv)
{
int n=1000000;
int rep=100;
if (argc>=2)
n=atoi(argv[1]);
if (argc>=3)
rep=atoi(argv[2]);
std::vector<Point> points;
points.reserve(n);
CGAL::Random_points_in_sphere_3<Point,Creator> g(1);
CGAL::copy_n( g, n, std::back_inserter(points));
Delaunay original;
original.insert(points.begin(),points.end());
double res = 0;
for (int r=0;r<rep;++r){
CGAL::Timer t; t.start();
Delaunay delaunay=original;
t.stop();
res+=t.time();
}
std::cout << res << std::endl;
return 0;
}
2012-03-30 12:37:19 +00:00
8f59fd9592
Turn QPL into LGPLv3+
2012-01-13 16:33:35 +00:00
b7c33d7b2e
Add a comment to mark the end of move_if_no_collision
...
The function body of Triangulation_3<Gt,Tds>::move_if_no_collision is so
long that comments should be added to mark blocks ends. For now, mark the
end of the function body.
2011-08-24 13:39:51 +00:00
e8fb926dae
Add missing return statements
2011-06-29 14:19:27 +00:00
cc9929b7de
qualify boost::bind to avoid ambiguity on windows.
2011-06-08 06:36:55 +00:00
a2daef39ab
Add a comment, that explain a tricky line of code.
...
(Actually, seeing the code, I first thought there was a bug. But then I
understood. That is why I think the comment may be is helpful for others).
2011-02-11 10:43:45 +00:00
7e1f88e0cb
Abort operator>> as soon as one of the error flags failbit or badbit is set
...
on the stream. That avoids a possible very long loop if the stream format
is not the excepted one (imagine that is >> n sets n to INTMAX...)
2011-02-08 16:13:38 +00:00
3181ed9401
merge only the code to insert points with info by range from the branch
...
/branches/experimental-packages/Triangulation_insert_with_info/Triangulation_3
2011-01-10 16:00:51 +00:00
96162627aa
Merge the following small features in trunk:
...
https://cgal.geometryfactory.com/CGAL/Members/wiki/Features/Small_Features/Remove_cluster
https://cgal.geometryfactory.com/CGAL/Members/wiki/Features/Small_Features/Structural_filtering
Merge also a partial support of:
https://cgal.geometryfactory.com/CGAL/Members/wiki/Features/Small_Features/Rt::vertices_inside_conflict_zone
(vertices_inside_conflict_zone" is added in Regular_triangulation_3, without documenting it)
2010-12-10 17:02:10 +00:00
0625b6c6bd
int -> std::size_t|size_type
2010-06-24 13:27:44 +00:00
1e12152c5f
int size_t fixes
2010-06-24 12:50:37 +00:00
d185e4152f
Finally use ptrdiff_t as return type for insert(beg, end)
2010-06-23 13:35:35 +00:00
b456cdb994
int -> size_type/std::size_t
2010-06-21 20:31:19 +00:00
c79a1ebbf6
int -> size_type/std::size_t
2010-06-21 14:12:02 +00:00
52317dd49f
add python script (replace_CGAL_NAMESPACE.py) to replace CGAL_BEGIN_NAMESPACE and CGAL_END_NAMESPACE
...
by namespace CGAL { and } //namespace CGAL. in all .h and .cpp files
in a directory.
Apply it to all packages in the trunk
Remove macro definition from the config.h file.
2010-06-09 07:37:13 +00:00
7e87099363
Merge the branch /branches/candidate-packages/Triangulation_3
...
- Work from:
Pedro Machado Manhaes de Castro <Pedro.Machado@sophia.inria.fr>
Olivier Devillers <Olivier.Devillers@sophia.inria.fr>
- The work is:
- displacement for 3D triangulation (Olivier and Pedro)
https://cgal.geometryfactory.com/CGAL/Members/wiki/Features/Move_T2T3
2010-05-31 08:48:09 +00:00
6edc1c3f73
Remove random_shuffle from insert(b,e) functions as spatial_sort does it now
2010-01-27 13:50:23 +00:00
84932f89cc
Make locate() deterministic using Boost RNGs.
...
The previous approach using a local CGAL::Random failed because it still uses a
global state through drand48()...
2010-01-26 14:55:44 +00:00
ce3541e210
Improve locate() reproducibility.
2010-01-25 12:11:45 +00:00
266a053335
More debugging aid : add an is_simplex() function to [expensive] check that
...
the handle passed to locate() belongs to the triangulation.
2010-01-14 23:20:18 +00:00
45b6d32b62
Remove old (CGAL < 3.0) version of the remove() code (which could be triggered by CGAL_DELAUNAY_3_OLD_REMOVE).
...
No one complained about the new code, so let's remove the old remove.
2010-01-13 13:44:54 +00:00
4bcee3abdf
add geometric access functions point(...) +doc + tests
2009-12-04 12:14:50 +00:00
d09319501c
Use canonical form for for-loops over iterator ranges.
2009-11-10 12:53:07 +00:00
8573fe26ce
Rename CGALi to internal.
2009-08-24 17:10:04 +00:00
57603f0b3b
Allow CGAL::Default for the TDS parameters of the three main triangulation classes.
...
(patch extracted from the Triangulation_3_Location_policy branch as it is mostly orthogonal)
2009-08-17 09:48:07 +00:00
919321e300
Give the TDS the ability to store a more general Cell_data in cells,
...
than just an implicit access to a conflict_flag.
2009-08-11 20:05:42 +00:00
094505bb76
Define Face_circulator together with the other types.
2009-08-07 20:50:32 +00:00
8fdac12e77
Add insert_in_hole() function overloads (in T3 and TDS_3) taking an additional
...
Vertex_handle argument that specifies the vertex to be used for the new vertex
(instead of creating a new one internally).
2009-08-04 13:48:07 +00:00
395b1d569e
Remove white spaces at end of lines.
2009-08-04 13:36:15 +00:00
f846f65dcf
Fix indentation (4-spaces tabs had been introduced by Camille...).
2009-08-04 13:29:40 +00:00
cb7bbc1619
Minor cleanup (un-share variable).
2009-08-04 12:58:30 +00:00
ffedfc0d58
Add some locate() and insert() convenient overloads, taking the start hint as a
...
Vertex_handle (instead of the Cell_handle currently).
2009-07-24 21:57:38 +00:00
7df2a2df3b
Remover short name macros. See PR 1551.
2009-04-21 18:34:14 +00:00
ba9b7b7143
incident_vertices(vertex) renamed as adjacent_vertices()
...
old name left for backward compatibility (and old functions still tested)
2009-04-08 10:06:32 +00:00
0e0975df31
same derecursion, for find_conflict, this time.
2008-11-14 10:43:11 +00:00
4aa1cb057a
Remove my email adress from header files.
2008-10-11 20:21:08 +00:00
25a4741b11
revert change, code was right before
2008-09-15 20:54:02 +00:00
a1802d060c
pass assignment operator argument as reference
2008-09-15 19:36:15 +00:00
93cae6500f
Remove deprecated functions find_conflicts_2 and find_conflicts_3
...
(deprecated in 2006, and internal).
2008-07-28 18:16:14 +00:00
7f70bb34c1
moved identical remove helper functions from
...
Delaunay_triangulation_3 and Regular_triangulation_3
to Triangulation_3
2008-07-03 12:11:31 +00:00
a6d18262ae
adds (finite_) incident_facets(Vertex) for the 2D case,
...
deprecates the usage of (finite_) incident_cells in the 2D case.
2008-06-05 02:51:51 +00:00
Jane Tournois
Sébastien Loriot
Laurent Rineau
Andreas Fabri
Jane Tournois
Laurent Rineau
Sébastien Loriot
Sylvain Pion
Manuel Caroli
Monique Teillaud
Camille Wormser